sstables: fix use-after-free in read_simple()

`r` is moved-from, and later captured in a different lambda. The compiler may
choose to move and perform the other capture later, resulting in a use-after-free.

Fix by copying `r` instead of moving it.

Discovered by sstable_test in debug mode.
Message-Id: <20170702082546.20570-1-avi@scylladb.com>

(cherry picked from commit 07b8adce0e)

.gitignore

@@ -9,12 +9,3 @@ dist/ami/files/*.rpm
 dist/ami/variables.json
 dist/ami/scylla_deploy.sh
 *.pyc
-Cql.tokens
-.kdev4
-*.kdev4
-CMakeLists.txt.user
-.cache
-.tox
-*.egg-info
-__pycache__CMakeLists.txt.user
-.gdbinit

CMakeLists.txt

@@ -1,140 +0,0 @@
-##
-## For best results, first compile the project using the Ninja build-system.
-##
-
-cmake_minimum_required(VERSION 3.7)
-project(scylla)
-
-if (NOT DEFINED FOR_IDE AND NOT DEFINED ENV{FOR_IDE} AND NOT DEFINED ENV{CLION_IDE})
-    message(FATAL_ERROR "This CMakeLists.txt file is only valid for use in IDEs, please define FOR_IDE to acknowledge this.")
-endif()
-
-# Default value. A more accurate list is populated through `pkg-config` below if `seastar.pc` is available.
-set(SEASTAR_INCLUDE_DIRS "seastar")
-
-# These paths are always available, since they're included in the repository. Additional DPDK headers are placed while
-# Seastar is built, and are captured in `SEASTAR_INCLUDE_DIRS` through parsing the Seastar pkg-config file (below).
-set(SEASTAR_DPDK_INCLUDE_DIRS
-        seastar/dpdk/lib/librte_eal/common/include
-        seastar/dpdk/lib/librte_eal/common/include/generic
-        seastar/dpdk/lib/librte_eal/common/include/x86
-        seastar/dpdk/lib/librte_ether)
-
-find_package(PkgConfig REQUIRED)
-
-set(ENV{PKG_CONFIG_PATH} "${CMAKE_SOURCE_DIR}/seastar/build/release:$ENV{PKG_CONFIG_PATH}")
-pkg_check_modules(SEASTAR seastar)
-
-find_package(Boost COMPONENTS filesystem program_options system thread)
-
-##
-## Populate the names of all source and header files in the indicated paths in a designated variable.
-##
-## When RECURSIVE is specified, directories are traversed recursively.
-##
-## Use: scan_scylla_source_directories(VAR my_result_var [RECURSIVE] PATHS [path1 path2 ...])
-##
-function (scan_scylla_source_directories)
-    set(options RECURSIVE)
-    set(oneValueArgs VAR)
-    set(multiValueArgs PATHS)
-    cmake_parse_arguments(args "${options}" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}")
-
-    set(globs "")
-
-    foreach (dir ${args_PATHS})
-        list(APPEND globs "${dir}/*.cc" "${dir}/*.hh")
-    endforeach()
-
-    if (args_RECURSIVE)
-        set(glob_kind GLOB_RECURSE)
-    else()
-        set(glob_kind GLOB)
-    endif()
-
-    file(${glob_kind} var
-            ${globs})
-
-    set(${args_VAR} ${var} PARENT_SCOPE)
-endfunction()
-
-## Although Seastar is an external project, it is common enough to explore the sources while doing
-## Scylla development that we'll treat the Seastar sources as part of this project for easier navigation.
-scan_scylla_source_directories(
-        VAR SEASTAR_SOURCE_FILES
-        RECURSIVE
-
-        PATHS
-          seastar/core
-          seastar/http
-          seastar/json
-          seastar/net
-          seastar/rpc
-          seastar/tests
-          seastar/util)
-
-scan_scylla_source_directories(
-        VAR SCYLLA_ROOT_SOURCE_FILES
-        PATHS .)
-
-scan_scylla_source_directories(
-        VAR SCYLLA_SUB_SOURCE_FILES
-        RECURSIVE
-
-        PATHS
-          api
-          auth
-          cql3
-          db
-          dht
-          exceptions
-          gms
-          index
-          io
-          locator
-          message
-          repair
-          service
-          sstables
-          streaming
-          tests
-          thrift
-          tracing
-          transport
-          utils)
-
-scan_scylla_source_directories(
-        VAR SCYLLA_GEN_SOURCE_FILES
-        RECURSIVE
-        PATHS build/release/gen)
-
-set(SCYLLA_SOURCE_FILES
-        ${SCYLLA_ROOT_SOURCE_FILES}
-        ${SCYLLA_GEN_SOURCE_FILES}
-        ${SCYLLA_SUB_SOURCE_FILES})
-
-add_executable(scylla
-        ${SEASTAR_SOURCE_FILES}
-        ${SCYLLA_SOURCE_FILES})
-
-# Note that since CLion does not undestand GCC6 concepts, we always disable them (even if users configure otherwise).
-# CLion seems to have trouble with `-U` (macro undefinition), so we do it this way instead.
-list(REMOVE_ITEM SEASTAR_CFLAGS "-DHAVE_GCC6_CONCEPTS")
-
-# If the Seastar pkg-config information is available, append to the default flags.
-#
-# For ease of browsing the source code, we always pretend that DPDK is enabled.
-target_compile_options(scylla PUBLIC
-        -std=gnu++14
-        -DHAVE_DPDK
-        -DHAVE_HWLOC
-        "${SEASTAR_CFLAGS}")
-
-# The order matters here: prefer the "static" DPDK directories to any dynamic paths from pkg-config. Some files are only
-# available dynamically, though.
-target_include_directories(scylla PUBLIC
-        .
-        ${SEASTAR_DPDK_INCLUDE_DIRS}
-        ${SEASTAR_INCLUDE_DIRS}
-        ${Boost_INCLUDE_DIRS}
-        build/release/gen)

HACKING.md

@@ -1,233 +0,0 @@
-# Guidelines for developing Scylla
-
-This document is intended to help developers and contributors to Scylla get started. The first part consists of general guidelines that make no assumptions about a development environment or tooling. The second part describes a particular environment and work-flow for exemplary purposes.
-
-## Overview
-
-This section covers some high-level information about the Scylla source code and work-flow.
-
-### Getting the source code
-
-Scylla uses [Git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) to manage its dependency on Seastar and other tools. Be sure that all submodules are correctly initialized when cloning the project:
-
-```bash
-$ git clone https://github.com/scylladb/scylla
-$ cd scylla
-$ git submodule update --init --recursive
-```
-
-### Dependencies
-
-Scylla depends on the system package manager for its development dependencies.
-
-Running `./install_dependencies.sh` (as root) installs the appropriate packages based on your Linux distribution.
-
-### Build system
-
-**Note**: Compiling Scylla requires, conservatively, 2 GB of memory per native thread, and up to 3 GB per native thread while linking.
-
-Scylla is built with [Ninja](https://ninja-build.org/), a low-level rule-based system. A Python script, `configure.py`, generates a Ninja file (`build.ninja`) based on configuration options.
-
-To build for the first time:
-
-```bash
-$ ./configure.py
-$ ninja-build
-```
-
-Afterwards, it is sufficient to just execute Ninja.
-
-The full suite of options for project configuration is available via
-
-```bash
-$ ./configure.py --help
-```
-
-The most important options are:
-
-- `--mode={release,debug,all}`: Debug mode enables [AddressSanitizer](https://github.com/google/sanitizers/wiki/AddressSanitizer) and allows for debugging with tools like GDB. Debugging builds are generally slower and generate much larger object files than release builds.
-
-- `--{enable,disable}-dpdk`: [DPDK](http://dpdk.org/) is a set of libraries and drivers for fast packet processing. During development, it's not necessary to enable support even if it is supported by your platform.
-
-Source files and build targets are tracked manually in `configure.py`, so the script needs to be updated when new files or targets are added or removed.
-
-To save time -- for instance, to avoid compiling all unit tests -- you can also specify specific targets to Ninja. For example,
-
-```bash
-$ ninja-build build/release/tests/schema_change_test
-```
-
-### Unit testing
-
-Unit tests live in the `/tests` directory. Like with application source files, test sources and executables are specified manually in `configure.py` and need to be updated when changes are made.
-
-A test target can be any executable. A non-zero return code indicates test failure.
-
-Most tests in the Scylla repository are built using the [Boost.Test](http://www.boost.org/doc/libs/1_64_0/libs/test/doc/html/index.html) library. Utilities for writing tests with Seastar futures are also included.
-
-Run all tests through the test execution wrapper with
-
-```bash
-$ ./test.py --mode={debug,release}
-```
-
-The `--name` argument can be specified to run a particular test.
-
-Alternatively, you can execute the test executable directly. For example,
-
-```bash
-$ build/release/tests/row_cache_test -- -c1 -m1G
-```
-
-The `-c1 -m1G` arguments limit this Seastar-based test to a single system thread and 1 GB of memory.
-
-### Preparing patches
-
-All changes to Scylla are submitted as patches to the public mailing list. Once a patch is approved by one of the maintainers of the project, it is committed to the maintainers' copy of the repository at https://github.com/scylladb/scylla.
-
-Detailed instructions for formatting patches for the mailing list and advice on preparing good patches are available at the [ScyllaDB website](http://docs.scylladb.com/contribute/).
-
-### Running Scylla
-
-Once Scylla has been compiled, executing the (`debug` or `release`) target will start a running instance in the foreground:
-
-```bash
-$ build/release/scylla
-```
-
-The `scylla` executable requires a configuration file, `scylla.yaml`. By default, this is read from `$SCYLLA_HOME/conf/scylla.yaml`. A good starting point for development is located in the repository at `/conf/scylla.yaml`.
-
-For development, a directory at `$HOME/scylla` can be used for all Scylla-related files:
-
-```bash
-$ mkdir -p $HOME/scylla $HOME/scylla/conf
-$ cp conf/scylla.yaml $HOME/scylla/conf/scylla.yaml
-$ # Edit configuration options as appropriate
-$ SCYLLA_HOME=$HOME/scylla build/release/scylla
-```
-
-The `scylla.yaml` file in the repository by default writes all database data to `/var/lib/scylla`, which likely requires root access. Change the `data_file_directories` and `commitlog_directory` fields as appropriate.
-
-Scylla has a number of requirements for the file-system and operating system to operate ideally and at peak performance. However, during development, these requirements can be relaxed with the `--developer-mode` flag.
-
-Additionally, when running on under-powered platforms like portable laptops, the `--overprovisined` flag is useful.
-
-On a development machine, one might run Scylla as
-
-```bash
-$ SCYLLA_HOME=$HOME/scylla build/release/scylla --overprovisioned --developer-mode=yes
-```
-
-### Branches and tags
-
-Multiple release branches are maintained on the Git repository at https://github.com/scylladb/scylla. Release 1.5, for instance, is tracked on the `branch-1.5` branch.
-
-Similarly, tags are used to pin-point precise release versions, including hot-fix versions like 1.5.4. These are named `scylla-1.5.4`, for example.
-
-Most development happens on the `master` branch. Release branches are cut from `master` based on time and/or features. When a patch against `master` fixes a serious issue like a node crash or data loss, it is backported to a particular release branch with `git cherry-pick` by the project maintainers.
-
-## Example: development on Fedora 25
-
-This section describes one possible work-flow for developing Scylla on a Fedora 25 system. It is presented as an example to help you to develop a work-flow and tools that you are comfortable with.
-
-### Preface
-
-This guide will be written from the perspective of a fictitious developer, Taylor Smith.
-
-### Git work-flow
-
-Having two Git remotes is useful:
-
-- A public clone of Seastar (`"public"`)
-- A private clone of Seastar (`"private"`) for in-progress work or work that is not yet ready to share
-
-The first step to contributing a change to Scylla is to create a local branch dedicated to it. For example, a feature that fixes a bug in the CQL statement for creating tables could be called `ts/cql_create_table_error/v1`. The branch name is prefaced by the developer's initials and has a suffix indicating that this is the first version. The version suffix is useful when branches are shared publicly and changes are requested on the mailing list. Having a branch for each version of the patch (or patch set) shared publicly makes it easier to reference and compare the history of a change.
-
-Setting the upstream branch of your development branch to `master` is a useful way to track your changes. You can do this with
-
-```bash
-$ git branch -u master ts/cql_create_table_error/v1
-```
-
-As a patch set is developed, you can periodically push the branch to the private remote to back-up work.
-
-Once the patch set is ready to be reviewed, push the branch to the public remote and prepare an email to the `scylladb-dev` mailing list. Including a link to the branch on your public remote allows for reviewers to quickly test and explore your changes.
-
-### Development environment and source code navigation
-
-Scylla includes a [CMake](https://cmake.org/) file, `CMakeLists.txt`, for use only with development environments (not for building) so that they can properly analyze the source code.
-
-[CLion](https://www.jetbrains.com/clion/) is a commercial IDE offers reasonably good source code navigation and advice for code hygiene, though its C++ parser sometimes makes errors and flags false issues.
-
-Other good options that directly parse CMake files are [KDevelop](https://www.kdevelop.org/) and [QtCreator](https://wiki.qt.io/Qt_Creator).
-
-To use the `CMakeLists.txt` file with these programs, define the `FOR_IDE` CMake variable or shell environmental variable.
-
-[Eclipse](https://eclipse.org/cdt/) is another open-source option. It doesn't natively work with CMake projects, and its C++ parser has many similar issues as CLion.
-
-### Distributed compilation: `distcc` and `ccache`
-
-Scylla's compilations times can be long. Two tools help somewhat:
-
-- [ccache](https://ccache.samba.org/) caches compiled object files on disk and re-uses them when possible
-- [distcc](https://github.com/distcc/distcc) distributes compilation jobs to remote machines
-
-A reasonably-powered laptop acts as the coordinator for compilation. A second, more powerful, machine acts as a passive compilation server.
-
-Having a direct wired connection between the machines ensures that object files can be transmitted quickly and limits the overhead of remote compilation.
-The coordinator has been assigned the static IP address `10.0.0.1` and the passive compilation machine has been assigned `10.0.0.2`.
-
-On Fedora, installing the `ccache` package places symbolic links for `gcc` and `g++` in the `PATH`. This allows normal compilation to transparently invoke `ccache` for compilation and cache object files on the local file-system.
-
-Next, set `CCACHE_PREFIX` so that `ccache` is responsible for invoking `distcc` as necessary:
-
-```bash
-export CCACHE_PREFIX="distcc"
-```
-
-On each host, edit `/etc/sysconfig/distccd` to include the allowed coordinators and the total number of jobs that the machine should accept.
-This example is for the laptop, which has 2 physical cores (4 logical cores with hyper-threading):
-
-```
-OPTIONS="--allow 10.0.0.2 --allow 127.0.0.1 --jobs 4"
-```
-
-`10.0.0.2` has 8 physical cores (16 logical cores) and 64 GB of memory.
-
-As a rule-of-thumb, the number of jobs that a machine should be specified to support should be equal to the number of its native threads.
-
-Restart the `distccd` service on all machines.
-
-On the coordinator machine, edit `$HOME/.distcc/hosts` with the available hosts for compilation. Order of the hosts indicates preference.
-
-```
-10.0.0.2/16 localhost/2
-```
-
-In this example, `10.0.0.2` will be sent up to 16 jobs and the local machine will be sent up to 2. Allowing for two extra threads on the host machine for coordination, we run compilation with `16 + 2 + 2 = 20` jobs in total: `ninja-build -j20`.
-
-When a compilation is in progress, the status of jobs on all remote machines can be visualized in the terminal with `distccmon-text` or graphically as a GTK application with `distccmon-gnome`.
-
-One thing to keep in mind is that linking object files happens on the coordinating machine, which can be a bottleneck. See the next section speeding up this process.
-
-### Using the `gold` linker
-
-Linking Scylla can be slow. The gold linker can replace GNU ld and often speeds the linking process. On Fedora, you can switch the system linker using
-
-```bash
-$ sudo alternatives --config ld
-```
-
-### Testing changes in Seastar with Scylla
-
-Sometimes Scylla development is closely tied with a feature being developed in Seastar. It can be useful to compile Scylla with a particular check-out of Seastar.
-
-One way to do this it to create a local remote for the Seastar submodule in the Scylla repository:
-
-```bash
-$ cd $HOME/src/scylla
-$ cd seastar
-$ git remote add local /home/tsmith/src/seastar
-$ git remote update
-$ git checkout -t local/my_local_seastar_branch
-```

README.md

@@ -1,19 +1,29 @@
 # Scylla
 
-## Quick-start
+## Building Scylla
 
-```bash
-$ git submodule update --init --recursive
-$ sudo ./install-dependencies.sh
-$ ./configure.py --mode=release
-$ ninja-build -j4 # Assuming 4 system threads.
-$ ./build/release/scylla
-$ # Rejoice!
+In addition to required packages by Seastar, the following packages are required by Scylla.
+
+### Submodules
+Scylla uses submodules, so make sure you pull the submodules first by doing:
+```
+git submodule init
+git submodule update --init --recursive
 ```
 
-Please see [HACKING.md](HACKING.md) for detailed information on building and developing Scylla.
+### Building and Running Scylla on Fedora
+* Installing required packages:
 
-## Running Scylla
+```
+sudo dnf install yaml-cpp-devel lz4-devel zlib-devel snappy-devel jsoncpp-devel thrift-devel antlr3-tool antlr3-C++-devel libasan libubsan gcc-c++ gnutls-devel ninja-build ragel libaio-devel cryptopp-devel xfsprogs-devel numactl-devel hwloc-devel libpciaccess-devel libxml2-devel python3-pyparsing lksctp-tools-devel protobuf-devel protobuf-compiler systemd-devel libunwind-devel
+```
+
+* Build Scylla
+```
+./configure.py --mode=release --with=scylla --disable-xen
+ninja-build build/release/scylla -j2 # you can use more cpus if you have tons of RAM
+
+```
 
 * Run Scylla
 ```

SCYLLA-VERSION-GEN

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

api/api-doc/storage_service.json

@@ -952,22 +952,6 @@
             }
          ]
       },
-      {
-         "path":"/storage_service/force_terminate_repair",
-         "operations":[
-            {
-               "method":"POST",
-               "summary":"Force terminate all repair sessions",
-               "type":"void",
-               "nickname":"force_terminate_all_repair_sessions_new",
-               "produces":[
-                  "application/json"
-               ],
-               "parameters":[
-               ]
-            }
-         ]
-      },
       {
          "path":"/storage_service/decommission",
          "operations":[

api/api.cc

@@ -49,7 +49,7 @@ static std::unique_ptr<reply> exception_reply(std::exception_ptr eptr) {
         throw bad_param_exception(ex.what());
     }
     // We never going to get here
-    throw std::runtime_error("exception_reply");
+    return std::make_unique<reply>();
 }
 
 future<> set_server_init(http_context& ctx) {

api/api.hh

@@ -29,7 +29,6 @@
 #include "utils/histogram.hh"
 #include "http/exception.hh"
 #include "api_init.hh"
-#include "seastarx.hh"
 
 namespace api {
 

api/cache_service.cc

@@ -252,13 +252,13 @@ void set_cache_service(http_context& ctx, routes& r) {
         // In origin row size is the weighted size.
         // We currently do not support weights, so we use num entries instead
         return map_reduce_cf(ctx, 0, [](const column_family& cf) {
-            return cf.get_row_cache().partitions();
+            return cf.get_row_cache().num_entries();
         }, std::plus<uint64_t>());
     });
 
     cs::get_row_entries.set(r, [&ctx] (std::unique_ptr<request> req) {
         return map_reduce_cf(ctx, 0, [](const column_family& cf) {
-            return cf.get_row_cache().partitions();
+            return cf.get_row_cache().num_entries();
         }, std::plus<uint64_t>());
     });
 

api/column_family.cc

@@ -182,6 +182,15 @@ static int64_t max_row_size(column_family& cf) {
     return res;
 }
 
+static double update_ratio(double acc, double f, double total) {
+    if (f && !total) {
+        throw bad_param_exception("total should include all elements");
+    } else if (total) {
+        acc += f / total;
+    }
+    return acc;
+}
+
 static integral_ratio_holder mean_row_size(column_family& cf) {
     integral_ratio_holder res;
     for (auto i: *cf.get_sstables() ) {
@@ -274,16 +283,6 @@ static std::vector<uint64_t> concat_sstable_count_per_level(std::vector<uint64_t
     return a;
 }
 
-ratio_holder filter_false_positive_as_ratio_holder(const sstables::shared_sstable& sst) {
-    double f = sst->filter_get_false_positive();
-    return ratio_holder(f + sst->filter_get_true_positive(), f);
-}
-
-ratio_holder filter_recent_false_positive_as_ratio_holder(const sstables::shared_sstable& sst) {
-    double f = sst->filter_get_recent_false_positive();
-    return ratio_holder(f + sst->filter_get_recent_true_positive(), f);
-}
-
 void set_column_family(http_context& ctx, routes& r) {
     cf::get_column_family_name.set(r, [&ctx] (const_req req){
         vector<sstring> res;
@@ -605,27 +604,39 @@ void set_column_family(http_context& ctx, routes& r) {
     });
 
     cf::get_bloom_filter_false_ratio.set(r, [&ctx] (std::unique_ptr<request> req) {
-        return map_reduce_cf(ctx, req->param["name"], ratio_holder(), [] (column_family& cf) {
-            return boost::accumulate(*cf.get_sstables() | boost::adaptors::transformed(filter_false_positive_as_ratio_holder), ratio_holder());
-        }, std::plus<>());
+        return map_reduce_cf(ctx, req->param["name"], double(0), [] (column_family& cf) {
+            return std::accumulate(cf.get_sstables()->begin(), cf.get_sstables()->end(), double(0), [](double s, auto& sst) {
+                double f = sst->filter_get_false_positive();
+                return update_ratio(s, f, f + sst->filter_get_true_positive());
+            });
+        }, std::plus<double>());
     });
 
     cf::get_all_bloom_filter_false_ratio.set(r, [&ctx] (std::unique_ptr<request> req) {
-        return map_reduce_cf(ctx, ratio_holder(), [] (column_family& cf) {
-            return boost::accumulate(*cf.get_sstables() | boost::adaptors::transformed(filter_false_positive_as_ratio_holder), ratio_holder());
-        }, std::plus<>());
+        return map_reduce_cf(ctx, double(0), [] (column_family& cf) {
+            return std::accumulate(cf.get_sstables()->begin(), cf.get_sstables()->end(), double(0), [](double s, auto& sst) {
+                double f = sst->filter_get_false_positive();
+                return update_ratio(s, f, f + sst->filter_get_true_positive());
+            });
+        }, std::plus<double>());
     });
 
     cf::get_recent_bloom_filter_false_ratio.set(r, [&ctx] (std::unique_ptr<request> req) {
-        return map_reduce_cf(ctx, req->param["name"], ratio_holder(), [] (column_family& cf) {
-            return boost::accumulate(*cf.get_sstables() | boost::adaptors::transformed(filter_recent_false_positive_as_ratio_holder), ratio_holder());
-        }, std::plus<>());
+        return map_reduce_cf(ctx, req->param["name"], double(0), [] (column_family& cf) {
+            return std::accumulate(cf.get_sstables()->begin(), cf.get_sstables()->end(), double(0), [](double s, auto& sst) {
+                double f = sst->filter_get_recent_false_positive();
+                return update_ratio(s, f, f + sst->filter_get_recent_true_positive());
+            });
+        }, std::plus<double>());
     });
 
     cf::get_all_recent_bloom_filter_false_ratio.set(r, [&ctx] (std::unique_ptr<request> req) {
-        return map_reduce_cf(ctx, ratio_holder(), [] (column_family& cf) {
-            return boost::accumulate(*cf.get_sstables() | boost::adaptors::transformed(filter_recent_false_positive_as_ratio_holder), ratio_holder());
-        }, std::plus<>());
+        return map_reduce_cf(ctx, double(0), [] (column_family& cf) {
+            return std::accumulate(cf.get_sstables()->begin(), cf.get_sstables()->end(), double(0), [](double s, auto& sst) {
+                double f = sst->filter_get_recent_false_positive();
+                return update_ratio(s, f, f + sst->filter_get_recent_true_positive());
+            });
+        }, std::plus<double>());
     });
 
     cf::get_bloom_filter_disk_space_used.set(r, [&ctx] (std::unique_ptr<request> req) {

api/compaction_manager.cc

@@ -20,13 +20,13 @@
  */
 
 #include "compaction_manager.hh"
-#include "sstables/compaction_manager.hh"
 #include "api/api-doc/compaction_manager.json.hh"
 #include "db/system_keyspace.hh"
 #include "column_family.hh"
 
 namespace api {
 
+using namespace scollectd;
 namespace cm = httpd::compaction_manager_json;
 using namespace json;
 

api/hinted_handoff.cc

@@ -24,6 +24,7 @@
 
 namespace api {
 
+using namespace scollectd;
 using namespace json;
 namespace hh = httpd::hinted_handoff_json;
 

api/lsa.cc

@@ -29,11 +29,11 @@
 
 namespace api {
 
-static logging::logger alogger("lsa-api");
+static logging::logger logger("lsa-api");
 
 void set_lsa(http_context& ctx, routes& r) {
     httpd::lsa_json::lsa_compact.set(r, [&ctx](std::unique_ptr<request> req) {
-        alogger.info("Triggering compaction");
+        logger.info("Triggering compaction");
         return ctx.db.invoke_on_all([] (database&) {
             logalloc::shard_tracker().reclaim(std::numeric_limits<size_t>::max());
         }).then([] {

api/messaging_service.cc

@@ -27,7 +27,7 @@
 #include <sstream>
 
 using namespace httpd::messaging_service_json;
-using namespace netw;
+using namespace net;
 
 namespace api {
 
@@ -120,13 +120,13 @@ void set_messaging_service(http_context& ctx, routes& r) {
     }));
 
     get_version.set(r, [](const_req req) {
-        return netw::get_local_messaging_service().get_raw_version(req.get_query_param("addr"));
+        return net::get_local_messaging_service().get_raw_version(req.get_query_param("addr"));
     });
 
     get_dropped_messages_by_ver.set(r, [](std::unique_ptr<request> req) {
         shared_ptr<std::vector<uint64_t>> map = make_shared<std::vector<uint64_t>>(num_verb);
 
-        return netw::get_messaging_service().map_reduce([map](const uint64_t* local_map) mutable {
+        return net::get_messaging_service().map_reduce([map](const uint64_t* local_map) mutable {
             for (auto i = 0; i < num_verb; i++) {
                 (*map)[i]+= local_map[i];
             }

api/storage_proxy.cc

@@ -397,7 +397,7 @@ void set_storage_proxy(http_context& ctx, routes& r) {
     });
 
     sp::get_range_estimated_histogram.set(r, [&ctx](std::unique_ptr<request> req) {
-        return sum_timer_stats(ctx.sp, &proxy::stats::range);
+        return sum_timer_stats(ctx.sp, &proxy::stats::read);
     });
 
     sp::get_range_latency.set(r, [&ctx](std::unique_ptr<request> req) {

api/storage_service.cc

@@ -34,7 +34,6 @@
 #include "column_family.hh"
 #include "log.hh"
 #include "release.hh"
-#include "sstables/compaction_manager.hh"
 
 namespace api {
 
@@ -362,22 +361,16 @@ void set_storage_service(http_context& ctx, routes& r) {
             try {
                 res = fut.get0();
             } catch(std::runtime_error& e) {
-                throw httpd::bad_param_exception(e.what());
+                return make_ready_future<json::json_return_type>(json_exception(httpd::bad_param_exception(e.what())));
             }
             return make_ready_future<json::json_return_type>(json::json_return_type(res));
         });
     });
 
     ss::force_terminate_all_repair_sessions.set(r, [](std::unique_ptr<request> req) {
-        return repair_abort_all(service::get_local_storage_service().db()).then([] {
-            return make_ready_future<json::json_return_type>(json_void());
-        });
-    });
-
-    ss::force_terminate_all_repair_sessions_new.set(r, [](std::unique_ptr<request> req) {
-        return repair_abort_all(service::get_local_storage_service().db()).then([] {
-            return make_ready_future<json::json_return_type>(json_void());
-        });
+        //TBD
+        unimplemented();
+        return make_ready_future<json::json_return_type>(json_void());
     });
 
     ss::decommission.set(r, [](std::unique_ptr<request> req) {
@@ -809,8 +802,10 @@ void set_storage_service(http_context& ctx, routes& r) {
         return make_ready_future<json::json_return_type>(json_void());
     });
 
-    ss::get_metrics_load.set(r, [&ctx](std::unique_ptr<request> req) {
-        return get_cf_stats(ctx, &column_family::stats::live_disk_space_used);
+    ss::get_metrics_load.set(r, [](std::unique_ptr<request> req) {
+        //TBD
+        unimplemented();
+        return make_ready_future<json::json_return_type>(0);
     });
 
     ss::get_exceptions.set(r, [](const_req req) {

atomic_cell.hh

@@ -29,11 +29,10 @@
 #include "net/byteorder.hh"
 #include <cstdint>
 #include <iosfwd>
-#include <seastar/util/gcc6-concepts.hh>
 
-template<typename T, typename Input>
+template<typename T>
 static inline
-void set_field(Input& v, unsigned offset, T val) {
+void set_field(managed_bytes& v, unsigned offset, T val) {
     reinterpret_cast<net::packed<T>*>(v.begin() + offset)->raw = net::hton(val);
 }
 
@@ -59,7 +58,6 @@ private:
     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 int8_t COUNTER_UPDATE_FLAG = 0x08; // Cell is a counter update.
-    static constexpr int8_t COUNTER_IN_PLACE_REVERT = 0x10;
     static constexpr unsigned flags_size = 1;
     static constexpr unsigned timestamp_offset = flags_size;
     static constexpr unsigned timestamp_size = 8;
@@ -69,7 +67,6 @@ private:
     static constexpr unsigned deletion_time_size = 4;
     static constexpr unsigned ttl_offset = expiry_offset + expiry_size;
     static constexpr unsigned ttl_size = 4;
-    friend class counter_cell_builder;
 private:
     static bool is_counter_update(bytes_view cell) {
         return cell[0] & COUNTER_UPDATE_FLAG;
@@ -77,17 +74,10 @@ private:
     static bool is_revert_set(bytes_view cell) {
         return cell[0] & REVERT_FLAG;
     }
-    static bool is_counter_in_place_revert_set(bytes_view cell) {
-        return cell[0] & COUNTER_IN_PLACE_REVERT;
-    }
     template<typename BytesContainer>
     static void set_revert(BytesContainer& cell, bool revert) {
         cell[0] = (cell[0] & ~REVERT_FLAG) | (revert * REVERT_FLAG);
     }
-    template<typename BytesContainer>
-    static void set_counter_in_place_revert(BytesContainer& cell, bool flag) {
-        cell[0] = (cell[0] & ~COUNTER_IN_PLACE_REVERT) | (flag * COUNTER_IN_PLACE_REVERT);
-    }
     static bool is_live(const bytes_view& cell) {
         return cell[0] & LIVE_FLAG;
     }
@@ -101,30 +91,13 @@ private:
     static api::timestamp_type timestamp(const bytes_view& cell) {
         return get_field<api::timestamp_type>(cell, timestamp_offset);
     }
-    template<typename BytesContainer>
-    static void set_timestamp(BytesContainer& cell, api::timestamp_type ts) {
-        set_field(cell, timestamp_offset, ts);
-    }
     // Can be called on live cells only
-private:
-    template<typename BytesView>
-    static BytesView do_get_value(BytesView cell) {
+    static bytes_view value(bytes_view cell) {
         auto expiry_field_size = bool(cell[0] & EXPIRY_FLAG) * (expiry_size + ttl_size);
         auto value_offset = flags_size + timestamp_size + expiry_field_size;
         cell.remove_prefix(value_offset);
         return cell;
     }
-public:
-    static bytes_view value(bytes_view cell) {
-        return do_get_value(cell);
-    }
-    static bytes_mutable_view value(bytes_mutable_view cell) {
-        return do_get_value(cell);
-    }
-    // Can be called on live counter update cells only
-    static int64_t counter_update_value(bytes_view cell) {
-        return get_field<int64_t>(cell, flags_size + timestamp_size);
-    }
     // Can be called only when is_dead() is true.
     static gc_clock::time_point deletion_time(const bytes_view& cell) {
         assert(is_dead(cell));
@@ -157,12 +130,12 @@ public:
         std::copy_n(value.begin(), value.size(), b.begin() + value_offset);
         return b;
     }
-    static managed_bytes make_live_counter_update(api::timestamp_type timestamp, int64_t value) {
+    static managed_bytes make_live_counter_update(api::timestamp_type timestamp, bytes_view value) {
         auto value_offset = flags_size + timestamp_size;
-        managed_bytes b(managed_bytes::initialized_later(), value_offset + sizeof(value));
+        managed_bytes b(managed_bytes::initialized_later(), value_offset + value.size());
         b[0] = LIVE_FLAG | COUNTER_UPDATE_FLAG;
         set_field(b, timestamp_offset, timestamp);
-        set_field(b, value_offset, value);
+        std::copy_n(value.begin(), value.size(), b.begin() + value_offset);
         return b;
     }
     static managed_bytes make_live(api::timestamp_type timestamp, bytes_view value, gc_clock::time_point expiry, gc_clock::duration ttl) {
@@ -175,31 +148,6 @@ public:
         std::copy_n(value.begin(), value.size(), b.begin() + value_offset);
         return b;
     }
-    // make_live_from_serializer() is intended for users that need to serialise
-    // some object or objects to the format used in atomic_cell::value().
-    // With just make_live() the patter would look like follows:
-    // 1. allocate a buffer and write to it serialised objects
-    // 2. pass that buffer to make_live()
-    // 3. make_live() needs to prepend some metadata to the cell value so it
-    //    allocates a new buffer and copies the content of the original one
-    //
-    // The allocation and copy of a buffer can be avoided.
-    // make_live_from_serializer() allows the user code to specify the timestamp
-    // and size of the cell value as well as provide the serialiser function
-    // object, which would write the serialised value of the cell to the buffer
-    // given to it by make_live_from_serializer().
-    template<typename Serializer>
-    GCC6_CONCEPT(requires requires(Serializer serializer, bytes::iterator it) {
-        serializer(it);
-    })
-    static managed_bytes make_live_from_serializer(api::timestamp_type timestamp, size_t size, Serializer&& serializer) {
-        auto value_offset = flags_size + timestamp_size;
-        managed_bytes b(managed_bytes::initialized_later(), value_offset + size);
-        b[0] = LIVE_FLAG;
-        set_field(b, timestamp_offset, timestamp);
-        serializer(b.begin() + value_offset);
-        return b;
-    }
     template<typename ByteContainer>
     friend class atomic_cell_base;
     friend class atomic_cell;
@@ -219,9 +167,6 @@ public:
     bool is_revert_set() const {
         return atomic_cell_type::is_revert_set(_data);
     }
-    bool is_counter_in_place_revert_set() const {
-        return atomic_cell_type::is_counter_in_place_revert_set(_data);
-    }
     bool is_live() const {
         return atomic_cell_type::is_live(_data);
     }
@@ -244,17 +189,10 @@ public:
     api::timestamp_type timestamp() const {
         return atomic_cell_type::timestamp(_data);
     }
-    void set_timestamp(api::timestamp_type ts) {
-        atomic_cell_type::set_timestamp(_data, ts);
-    }
     // Can be called on live cells only
-    auto value() const {
+    bytes_view value() const {
         return atomic_cell_type::value(_data);
     }
-    // Can be called on live counter update cells only
-    int64_t counter_update_value() const {
-        return atomic_cell_type::counter_update_value(_data);
-    }
     // Can be called only when is_dead(gc_clock::time_point)
     gc_clock::time_point deletion_time() const {
         return !is_live() ? atomic_cell_type::deletion_time(_data) : expiry() - ttl();
@@ -269,7 +207,7 @@ public:
     }
     // Can be called on live and dead cells
     bool has_expired(gc_clock::time_point now) const {
-        return is_live_and_has_ttl() && expiry() <= now;
+        return is_live_and_has_ttl() && expiry() < now;
     }
     bytes_view serialize() const {
         return _data;
@@ -277,9 +215,6 @@ public:
     void set_revert(bool revert) {
         atomic_cell_type::set_revert(_data, revert);
     }
-    void set_counter_in_place_revert(bool flag) {
-        atomic_cell_type::set_counter_in_place_revert(_data, flag);
-    }
 };
 
 class atomic_cell_view final : public atomic_cell_base<bytes_view> {
@@ -291,14 +226,6 @@ public:
     friend std::ostream& operator<<(std::ostream& os, const atomic_cell_view& acv);
 };
 
-class atomic_cell_mutable_view final : public atomic_cell_base<bytes_mutable_view> {
-    atomic_cell_mutable_view(bytes_mutable_view data) : atomic_cell_base(std::move(data)) {}
-public:
-    static atomic_cell_mutable_view from_bytes(bytes_mutable_view data) { return atomic_cell_mutable_view(data); }
-
-    friend class atomic_cell;
-};
-
 class atomic_cell_ref final : public atomic_cell_base<managed_bytes&> {
 public:
     atomic_cell_ref(managed_bytes& buf) : atomic_cell_base(buf) {}
@@ -327,9 +254,12 @@ public:
     static atomic_cell make_live(api::timestamp_type timestamp, const bytes& value) {
         return make_live(timestamp, bytes_view(value));
     }
-    static atomic_cell make_live_counter_update(api::timestamp_type timestamp, int64_t value) {
+    static atomic_cell make_live_counter_update(api::timestamp_type timestamp, bytes_view value) {
         return atomic_cell_type::make_live_counter_update(timestamp, value);
     }
+    static atomic_cell make_live_counter_update(api::timestamp_type timestamp, const bytes& value) {
+        return atomic_cell_type::make_live_counter_update(timestamp, bytes_view(value));
+    }
     static atomic_cell make_live(api::timestamp_type timestamp, bytes_view value,
         gc_clock::time_point expiry, gc_clock::duration ttl)
     {
@@ -347,10 +277,6 @@ public:
             return atomic_cell_type::make_live(timestamp, value, gc_clock::now() + *ttl, *ttl);
         }
     }
-    template<typename Serializer>
-    static atomic_cell make_live_from_serializer(api::timestamp_type timestamp, size_t size, Serializer&& serializer) {
-        return atomic_cell_type::make_live_from_serializer(timestamp, size, std::forward<Serializer>(serializer));
-    }
     friend class atomic_cell_or_collection;
     friend std::ostream& operator<<(std::ostream& os, const atomic_cell& ac);
 };
@@ -388,6 +314,11 @@ collection_mutation::operator collection_mutation_view() const {
     return { data };
 }
 
+namespace db {
+template<typename T>
+class serializer;
+}
+
 class column_definition;
 
 int compare_atomic_cell_for_merge(atomic_cell_view left, atomic_cell_view right);

atomic_cell_or_collection.hh

@@ -39,14 +39,10 @@ public:
     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_mutable_view as_mutable_atomic_cell() { return atomic_cell_mutable_view::from_bytes(_data); }
     atomic_cell_or_collection(collection_mutation cm) : _data(std::move(cm.data)) {}
     explicit operator bool() const {
         return !_data.empty();
     }
-    bool can_use_mutable_view() const {
-        return !_data.is_fragmented();
-    }
     static atomic_cell_or_collection from_collection_mutation(collection_mutation data) {
         return std::move(data.data);
     }

auth/allow_all_authenticator.cc

@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2017 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 "auth/allow_all_authenticator.hh"
-
-#include "service/migration_manager.hh"
-#include "utils/class_registrator.hh"
-
-namespace auth {
-
-const sstring& allow_all_authenticator_name() {
-    static const sstring name = meta::AUTH_PACKAGE_NAME + "AllowAllAuthenticator";
-    return name;
-}
-
-// To ensure correct initialization order, we unfortunately need to use a string literal.
-static const class_registrator<
-        authenticator,
-        allow_all_authenticator,
-        cql3::query_processor&,
-        ::service::migration_manager&> registration("org.apache.cassandra.auth.AllowAllAuthenticator");
-
-}

auth/allow_all_authenticator.hh

@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2017 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 <stdexcept>
-
-#include "auth/authenticator.hh"
-#include "auth/authenticated_user.hh"
-#include "auth/common.hh"
-
-namespace cql3 {
-class query_processor;
-}
-
-namespace service {
-class migration_manager;
-}
-
-namespace auth {
-
-const sstring& allow_all_authenticator_name();
-
-class allow_all_authenticator final : public authenticator {
-public:
-    allow_all_authenticator(cql3::query_processor&, ::service::migration_manager&) {
-    }
-
-    future<> start() override {
-        return make_ready_future<>();
-    }
-
-    future<> stop() override {
-        return make_ready_future<>();
-    }
-
-    const sstring& qualified_java_name() const override {
-        return allow_all_authenticator_name();
-    }
-
-    bool require_authentication() const override {
-        return false;
-    }
-
-    option_set supported_options() const override {
-        return option_set();
-    }
-
-    option_set alterable_options() const override {
-        return option_set();
-    }
-
-    future<::shared_ptr<authenticated_user>> authenticate(const credentials_map& credentials) const override {
-        return make_ready_future<::shared_ptr<authenticated_user>>(::make_shared<authenticated_user>());
-    }
-
-    future<> create(sstring username, const option_map& options) override {
-        return make_ready_future();
-    }
-
-    future<> alter(sstring username, const option_map& options) override {
-        return make_ready_future();
-    }
-
-    future<> drop(sstring username) override {
-        return make_ready_future();
-    }
-
-    const resource_ids& protected_resources() const override {
-        static const resource_ids ids;
-        return ids;
-    }
-
-    ::shared_ptr<sasl_challenge> new_sasl_challenge() const override {
-        throw std::runtime_error("Should not reach");
-    }
-};
-
-}

auth/allow_all_authorizer.cc

@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2017 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 "auth/allow_all_authorizer.hh"
-
-#include "auth/common.hh"
-#include "utils/class_registrator.hh"
-
-namespace auth {
-
-const sstring& allow_all_authorizer_name() {
-    static const sstring name = meta::AUTH_PACKAGE_NAME + "AllowAllAuthorizer";
-    return name;
-}
-
-// To ensure correct initialization order, we unfortunately need to use a string literal.
-static const class_registrator<
-    authorizer,
-    allow_all_authorizer,
-    cql3::query_processor&,
-    ::service::migration_manager&> registration("org.apache.cassandra.auth.AllowAllAuthorizer");
-
-}

auth/allow_all_authorizer.hh

@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2017 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"
-#include "exceptions/exceptions.hh"
-#include "stdx.hh"
-
-namespace cql3 {
-class query_processor;
-}
-
-namespace service {
-class migration_manager;
-}
-
-namespace auth {
-
-class service;
-
-const sstring& allow_all_authorizer_name();
-
-class allow_all_authorizer final  : public authorizer {
-public:
-    allow_all_authorizer(cql3::query_processor&, ::service::migration_manager&) {
-    }
-
-    future<> start() override {
-        return make_ready_future<>();
-    }
-
-    future<> stop() override {
-        return make_ready_future<>();
-    }
-
-    const sstring& qualified_java_name() const override {
-        return allow_all_authorizer_name();
-    }
-
-    future<permission_set> authorize(service&, ::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(
-            service&,
-            ::shared_ptr<authenticated_user> performer,
-            permission_set,
-            stdx::optional<data_resource>,
-            stdx::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();
-    }
-};
-
-}

auth/auth.cc

@@ -0,0 +1,387 @@
+/*
+ * 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 <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/raw/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");
+const sstring auth::auth::USERS_CF("users");
+
+static const sstring USER_NAME("name");
+static const sstring SUPER("super");
+
+static logging::logger logger("auth");
+
+// TODO: configurable
+using namespace std::chrono_literals;
+const std::chrono::milliseconds auth::auth::SUPERUSER_SETUP_DELAY = 10000ms;
+
+class auth_migration_listener : public service::migration_listener {
+    void on_create_keyspace(const sstring& ks_name) override {}
+    void on_create_column_family(const sstring& ks_name, const sstring& cf_name) override {}
+    void on_create_user_type(const sstring& ks_name, const sstring& type_name) override {}
+    void on_create_function(const sstring& ks_name, const sstring& function_name) override {}
+    void on_create_aggregate(const sstring& ks_name, const sstring& aggregate_name) override {}
+    void on_create_view(const sstring& ks_name, const sstring& view_name) override {}
+
+    void on_update_keyspace(const sstring& ks_name) override {}
+    void on_update_column_family(const sstring& ks_name, const sstring& cf_name, bool) override {}
+    void on_update_user_type(const sstring& ks_name, const sstring& type_name) override {}
+    void on_update_function(const sstring& ks_name, const sstring& function_name) override {}
+    void on_update_aggregate(const sstring& ks_name, const sstring& aggregate_name) override {}
+    void on_update_view(const sstring& ks_name, const sstring& view_name, bool columns_changed) override {}
+
+    void on_drop_keyspace(const sstring& ks_name) override {
+        auth::authorizer::get().revoke_all(auth::data_resource(ks_name));
+    }
+    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));
+    }
+    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 {}
+    void on_drop_aggregate(const sstring& ks_name, const sstring& aggregate_name) override {}
+    void on_drop_view(const sstring& ks_name, const sstring& view_name) override {}
+};
+
+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
+ * like origin, then runs the submitted tasks.
+ *
+ * Only difference compared to sleep (from which this
+ * borrows _heavily_) is that if tasks have not run by the time
+ * we exit (and do static clean up) we delete the promise + cont
+ *
+ * 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");
+
+    auto & waiters = thread_waiters();
+
+    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;
+                        });
+        if (i != waiters.end()) {
+            waiters.erase(i);
+        }
+    }).then([f = std::move(f)] {
+        logger.trace("Running scheduled task");
+        return f();
+    }).handle_exception([](auto ep) {
+        return make_ready_future();
+    });
+}
+
+bool auth::auth::is_class_type(const sstring& type, const sstring& classname) {
+    if (type == classname) {
+        return true;
+    }
+    auto i = classname.find_last_of('.');
+    return classname.compare(i + 1, sstring::npos, type) == 0;
+}
+
+future<> auth::auth::setup() {
+    auto& db = cql3::get_local_query_processor().db().local();
+    auto& cfg = db.get_config();
+
+    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 (!db.has_keyspace(AUTH_KS)) {
+        std::map<sstring, sstring> opts;
+        opts["replication_factor"] = "1";
+        auto ksm = keyspace_metadata::new_keyspace(AUTH_KS, "org.apache.cassandra.locator.SimpleStrategy", opts, true);
+        // We use min_timestamp so that default keyspace metadata will loose with any manual adjustments. See issue #2129.
+        f = service::get_local_migration_manager().announce_new_keyspace(ksm, api::min_timestamp, false);
+    }
+
+    return f.then([] {
+        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([] {
+        service::get_local_migration_manager().register_listener(&auth_migration); // again, only one shard...
+        // instead of once-timer, just schedule this later
+        schedule_when_up([] {
+            // setup default super user
+            return has_existing_users(USERS_CF, DEFAULT_SUPERUSER_NAME, USER_NAME).then([](bool exists) {
+                if (!exists) {
+                    auto query = sprint("INSERT INTO %s.%s (%s, %s) VALUES (?, ?) USING TIMESTAMP 0",
+                                    AUTH_KS, USERS_CF, USER_NAME, SUPER);
+                    cql3::get_local_query_processor().process(query, db::consistency_level::ONE, {DEFAULT_SUPERUSER_NAME, true}).then([](auto) {
+                        logger.info("Created default superuser '{}'", DEFAULT_SUPERUSER_NAME);
+                    }).handle_exception([](auto ep) {
+                        try {
+                            std::rethrow_exception(ep);
+                        } catch (exceptions::request_execution_exception&) {
+                            logger.warn("Skipped default superuser setup: some nodes were not ready");
+                        }
+                    });
+                }
+            });
+        });
+    });
+}
+
+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;
+    }
+    return db::consistency_level::LOCAL_ONE;
+}
+
+static future<::shared_ptr<cql3::untyped_result_set>> select_user(const sstring& username) {
+    // Here was a thread local, explicit cache of prepared statement. In normal execution this is
+    // fine, but since we in testing set up and tear down system over and over, we'd start using
+    // obsolete prepared statements pretty quickly.
+    // Rely on query processing caching statements instead, and lets assume
+    // that a map lookup string->statement is not gonna kill us much.
+    return cql3::get_local_query_processor().process(
+                    sprint("SELECT * FROM %s.%s WHERE %s = ?",
+                                    auth::auth::AUTH_KS, auth::auth::USERS_CF,
+                                    USER_NAME), consistency_for_user(username),
+                    { username }, true);
+}
+
+future<bool> auth::auth::is_existing_user(const sstring& username) {
+    return select_user(username).then(
+                    [](::shared_ptr<cql3::untyped_result_set> res) {
+                        return make_ready_future<bool>(!res->empty());
+                    });
+}
+
+future<bool> auth::auth::is_super_user(const sstring& username) {
+    return select_user(username).then(
+                    [](::shared_ptr<cql3::untyped_result_set> res) {
+                        return make_ready_future<bool>(!res->empty() && res->one().get_as<bool>(SUPER));
+                    });
+}
+
+future<> auth::auth::insert_user(const sstring& username, bool is_super)
+                throw (exceptions::request_execution_exception) {
+    return cql3::get_local_query_processor().process(sprint("INSERT INTO %s.%s (%s, %s) VALUES (?, ?)",
+                    AUTH_KS, USERS_CF, USER_NAME, SUPER),
+                    consistency_for_user(username), { username, is_super }).discard_result();
+}
+
+future<> auth::auth::delete_user(const sstring& username) throw(exceptions::request_execution_exception) {
+    return cql3::get_local_query_processor().process(sprint("DELETE FROM %s.%s WHERE %s = ?",
+                    AUTH_KS, USERS_CF, USER_NAME),
+                    consistency_for_user(username), { username }).discard_result();
+}
+
+future<> auth::auth::setup_table(const sstring& name, const sstring& cql) {
+    auto& qp = cql3::get_local_query_processor();
+    auto& db = qp.db().local();
+
+    if (db.has_schema(AUTH_KS, name)) {
+        return make_ready_future();
+    }
+
+    ::shared_ptr<cql3::statements::raw::cf_statement> parsed = static_pointer_cast<
+                    cql3::statements::raw::cf_statement>(cql3::query_processor::parse_statement(cql));
+    parsed->prepare_keyspace(AUTH_KS);
+    ::shared_ptr<cql3::statements::create_table_statement> statement =
+                    static_pointer_cast<cql3::statements::create_table_statement>(
+                                    parsed->prepare(db, qp.get_cql_stats())->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);
+}
+
+future<bool> auth::auth::has_existing_users(const sstring& cfname, const sstring& def_user_name, const sstring& name_column) {
+    auto default_user_query = sprint("SELECT * FROM %s.%s WHERE %s = ?", AUTH_KS, cfname, name_column);
+    auto all_users_query = sprint("SELECT * FROM %s.%s LIMIT 1", AUTH_KS, cfname);
+
+    return cql3::get_local_query_processor().process(default_user_query, db::consistency_level::ONE, { def_user_name }).then([=](::shared_ptr<cql3::untyped_result_set> res) {
+        if (!res->empty()) {
+            return make_ready_future<bool>(true);
+        }
+        return cql3::get_local_query_processor().process(default_user_query, db::consistency_level::QUORUM, { def_user_name }).then([all_users_query](::shared_ptr<cql3::untyped_result_set> res) {
+            if (!res->empty()) {
+                return make_ready_future<bool>(true);
+            }
+            return cql3::get_local_query_processor().process(all_users_query, db::consistency_level::QUORUM).then([](::shared_ptr<cql3::untyped_result_set> res) {
+                return make_ready_future<bool>(!res->empty());
+            });
+        });
+    });
+}
+

auth/auth.hh

@@ -0,0 +1,124 @@
+/*
+ * 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 <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;
+    static const std::chrono::milliseconds SUPERUSER_SETUP_DELAY;
+
+    static bool is_class_type(const sstring& type, const sstring& classname);
+
+    static future<permission_set> get_permissions(::shared_ptr<authenticated_user>, data_resource);
+
+    /**
+     * Checks if the username is stored in AUTH_KS.USERS_CF.
+     *
+     * @param username Username to query.
+     * @return whether or not Cassandra knows about the user.
+     */
+    static future<bool> is_existing_user(const sstring& username);
+
+    /**
+     * Checks if the user is a known superuser.
+     *
+     * @param username Username to query.
+     * @return true is the user is a superuser, false if they aren't or don't exist at all.
+     */
+    static future<bool> is_super_user(const sstring& username);
+
+    /**
+     * Inserts the user into AUTH_KS.USERS_CF (or overwrites their superuser status as a result of an ALTER USER query).
+     *
+     * @param username Username to insert.
+     * @param isSuper User's new status.
+     * @throws RequestExecutionException
+     */
+    static future<> insert_user(const sstring& username, bool is_super) throw(exceptions::request_execution_exception);
+
+    /**
+     * Deletes the user from AUTH_KS.USERS_CF.
+     *
+     * @param username Username to delete.
+     * @throws RequestExecutionException
+     */
+    static future<> delete_user(const sstring& username) throw(exceptions::request_execution_exception);
+
+    /**
+     * 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.
+     *
+     * @param name name of the table
+     * @param cql CREATE TABLE statement
+     */
+    static future<> setup_table(const sstring& name, const sstring& cql);
+
+    static future<bool> has_existing_users(const sstring& cfname, const sstring& def_user_name, const sstring& name_column_name);
+
+    // For internal use. Run function "when system is up".
+    typedef std::function<future<>()> scheduled_func;
+    static void schedule_when_up(scheduled_func);
+};
+}

auth/authenticated_user.cc

@@ -41,6 +41,7 @@
 
 
 #include "authenticated_user.hh"
+#include "auth.hh"
 
 const sstring auth::authenticated_user::ANONYMOUS_USERNAME("anonymous");
 
@@ -59,6 +60,13 @@ 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

@@ -43,7 +43,6 @@
 
 #include <seastar/core/sstring.hh>
 #include <seastar/core/future.hh>
-#include "seastarx.hh"
 
 namespace auth {
 
@@ -58,6 +57,14 @@ public:
 
     const sstring& name() const;
 
+    /**
+     * Checks the user's superuser status.
+     * Only a superuser is allowed to perform CREATE USER and DROP USER queries.
+     * Im most cased, though not necessarily, a superuser will have Permission.ALL on every resource
+     * (depends on IAuthorizer implementation).
+     */
+    future<bool> is_super() const;
+
     /**
      * If IAuthenticator doesn't require authentication, this method may return true.
      */

auth/authenticator.cc

@@ -41,14 +41,13 @@
 
 #include "authenticator.hh"
 #include "authenticated_user.hh"
-#include "common.hh"
 #include "password_authenticator.hh"
-#include "cql3/query_processor.hh"
+#include "auth.hh"
 #include "db/config.hh"
-#include "utils/class_registrator.hh"
 
 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) {
@@ -65,3 +64,64 @@ sstring auth::authenticator::option_to_string(option opt) {
         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.
+ */
+static std::unique_ptr<auth::authenticator> global_authenticator;
+
+future<>
+auth::authenticator::setup(const sstring& type) throw (exceptions::configuration_exception) {
+    if (auth::auth::is_class_type(type, ALLOW_ALL_AUTHENTICATOR_NAME)) {
+        class allow_all_authenticator : public authenticator {
+        public:
+            const sstring& class_name() const override {
+                return ALLOW_ALL_AUTHENTICATOR_NAME;
+            }
+            bool require_authentication() const override {
+                return false;
+            }
+            option_set supported_options() const override {
+                return option_set();
+            }
+            option_set alterable_options() const override {
+                return option_set();
+            }
+            future<::shared_ptr<authenticated_user>> authenticate(const credentials_map& credentials) const throw(exceptions::authentication_exception) override {
+                return make_ready_future<::shared_ptr<authenticated_user>>(::make_shared<authenticated_user>());
+            }
+            future<> create(sstring username, const option_map& options) throw(exceptions::request_validation_exception, exceptions::request_execution_exception) override {
+                return make_ready_future();
+            }
+            future<> alter(sstring username, const option_map& options) throw(exceptions::request_validation_exception, exceptions::request_execution_exception) override {
+                return make_ready_future();
+            }
+            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;
+            }
+            ::shared_ptr<sasl_challenge> new_sasl_challenge() const override {
+                throw std::runtime_error("Should not reach");
+            }
+        };
+        global_authenticator = std::make_unique<allow_all_authenticator>();
+    } else if (auth::auth::is_class_type(type, password_authenticator::PASSWORD_AUTHENTICATOR_NAME)) {
+        auto pwa = std::make_unique<password_authenticator>();
+        auto f = pwa->init();
+        return f.then([pwa = std::move(pwa)]() mutable {
+            global_authenticator = std::move(pwa);
+        });
+    } else {
+        throw exceptions::configuration_exception("Invalid authenticator type: " + type);
+    }
+    return make_ready_future();
+}
+
+auth::authenticator& auth::authenticator::get() {
+    assert(global_authenticator);
+    return *global_authenticator;
+}

auth/authenticator.hh

@@ -69,6 +69,7 @@ class authenticator {
 public:
     static const sstring USERNAME_KEY;
     static const sstring PASSWORD_KEY;
+    static const sstring ALLOW_ALL_AUTHENTICATOR_NAME;
 
     /**
      * Supported CREATE USER/ALTER USER options.
@@ -85,14 +86,23 @@ public:
     using option_map = std::unordered_map<option, boost::any, enum_hash<option>>;
     using credentials_map = std::unordered_map<sstring, sstring>;
 
+    /**
+     * Setup is called once upon system startup to initialize the IAuthenticator.
+     *
+     * For example, use this method to create any required keyspaces/column families.
+     * Note: Only call from main thread.
+     */
+    static future<> setup(const sstring& type) throw(exceptions::configuration_exception);
+
+    /**
+     * Returns the system authenticator. Must have called setup before calling this.
+     */
+    static authenticator& get();
+
     virtual ~authenticator()
     {}
 
-    virtual future<> start() = 0;
-
-    virtual future<> stop() = 0;
-
-    virtual const sstring& qualified_java_name() const = 0;
+    virtual const sstring& class_name() const = 0;
 
     /**
      * Whether or not the authenticator requires explicit login.
@@ -119,7 +129,7 @@ public:
      *
      * @throws authentication_exception if credentials don't match any known user.
      */
-    virtual future<::shared_ptr<authenticated_user>> authenticate(const credentials_map& credentials) const = 0;
+    virtual future<::shared_ptr<authenticated_user>> authenticate(const credentials_map& credentials) const throw(exceptions::authentication_exception) = 0;
 
     /**
      * Called during execution of CREATE USER query (also may be called on startup, see seedSuperuserOptions method).
@@ -131,7 +141,7 @@ public:
      * @throws exceptions::request_validation_exception
      * @throws exceptions::request_execution_exception
      */
-    virtual future<> create(sstring username, const option_map& options) = 0;
+    virtual future<> create(sstring username, const option_map& options) throw(exceptions::request_validation_exception, exceptions::request_execution_exception) = 0;
 
     /**
      * Called during execution of ALTER USER query.
@@ -144,7 +154,7 @@ public:
      * @throws exceptions::request_validation_exception
      * @throws exceptions::request_execution_exception
      */
-    virtual future<> alter(sstring username, const option_map& options) = 0;
+    virtual future<> alter(sstring username, const option_map& options) throw(exceptions::request_validation_exception, exceptions::request_execution_exception) = 0;
 
 
     /**
@@ -154,7 +164,7 @@ public:
      * @throws exceptions::request_validation_exception
      * @throws exceptions::request_execution_exception
      */
-    virtual future<> drop(sstring username) = 0;
+    virtual future<> drop(sstring username) throw(exceptions::request_validation_exception, exceptions::request_execution_exception) = 0;
 
      /**
      * Set of resources that should be made inaccessible to users and only accessible internally.
@@ -167,9 +177,9 @@ public:
     class sasl_challenge {
     public:
         virtual ~sasl_challenge() {}
-        virtual bytes evaluate_response(bytes_view client_response) = 0;
+        virtual bytes evaluate_response(bytes_view client_response) throw(exceptions::authentication_exception) = 0;
         virtual bool is_complete() const = 0;
-        virtual future<::shared_ptr<authenticated_user>> get_authenticated_user() const = 0;
+        virtual future<::shared_ptr<authenticated_user>> get_authenticated_user() const throw(exceptions::authentication_exception) = 0;
     };
 
     /**

auth/authorizer.cc

@@ -41,39 +41,23 @@
 
 #include "authorizer.hh"
 #include "authenticated_user.hh"
-#include "common.hh"
 #include "default_authorizer.hh"
 #include "auth.hh"
-#include "cql3/query_processor.hh"
 #include "db/config.hh"
-#include "utils/class_registrator.hh"
 
-const sstring& auth::allow_all_authorizer_name() {
-    static const sstring name = meta::AUTH_PACKAGE_NAME + "AllowAllAuthorizer";
-    return name;
-}
+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;
-using authorizer_registry = class_registry<auth::authorizer, cql3::query_processor&>;
 
 future<>
 auth::authorizer::setup(const sstring& type) {
-    if (type == allow_all_authorizer_name()) {
+    if (auth::auth::is_class_type(type, ALLOW_ALL_AUTHORIZER_NAME)) {
         class allow_all_authorizer : public authorizer {
         public:
-            future<> start() override {
-                return make_ready_future<>();
-            }
-            future<> stop() override {
-                return make_ready_future<>();
-            }
-            const sstring& qualified_java_name() const override {
-                return allow_all_authorizer_name();
-            }
             future<permission_set> authorize(::shared_ptr<authenticated_user>, data_resource) const override {
                 return make_ready_future<permission_set>(permissions::ALL);
             }
@@ -102,14 +86,16 @@ auth::authorizer::setup(const sstring& type) {
         };
 
         global_authorizer = std::make_unique<allow_all_authorizer>();
-        return make_ready_future();
-    } else {
-        auto a = authorizer_registry::create(type, cql3::get_local_query_processor());
-        auto f = a->start();
-        return f.then([a = std::move(a)]() mutable {
-            global_authorizer = std::move(a);
+    } 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() {

auth/authorizer.hh

@@ -51,12 +51,8 @@
 #include "permission.hh"
 #include "data_resource.hh"
 
-#include "seastarx.hh"
-
 namespace auth {
 
-class service;
-
 class authenticated_user;
 
 struct permission_details {
@@ -73,14 +69,10 @@ using std::experimental::optional;
 
 class authorizer {
 public:
+    static const sstring ALLOW_ALL_AUTHORIZER_NAME;
+
     virtual ~authorizer() {}
 
-    virtual future<> start() = 0;
-
-    virtual future<> stop() = 0;
-
-    virtual const sstring& qualified_java_name() const = 0;
-
     /**
      * The primary Authorizer method. Returns a set of permissions of a user on a resource.
      *
@@ -88,7 +80,7 @@ public:
      * @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(service&, ::shared_ptr<authenticated_user>, data_resource) const = 0;
+    virtual future<permission_set> authorize(::shared_ptr<authenticated_user>, data_resource) const = 0;
 
     /**
      * Grants a set of permissions on a resource to a user.
@@ -132,7 +124,7 @@ public:
      * @throws RequestValidationException
      * @throws RequestExecutionException
      */
-    virtual future<std::vector<permission_details>> list(service&, ::shared_ptr<authenticated_user> performer, permission_set, optional<data_resource>, optional<sstring>) const = 0;
+    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
@@ -162,6 +154,18 @@ public:
      * @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/common.cc

@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2017 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 "auth/common.hh"
-
-#include <seastar/core/shared_ptr.hh>
-
-#include "cql3/query_processor.hh"
-#include "cql3/statements/create_table_statement.hh"
-#include "schema_builder.hh"
-#include "service/migration_manager.hh"
-
-namespace auth {
-
-namespace meta {
-
-const sstring DEFAULT_SUPERUSER_NAME("cassandra");
-const sstring AUTH_KS("system_auth");
-const sstring USERS_CF("users");
-const sstring AUTH_PACKAGE_NAME("org.apache.cassandra.auth.");
-
-}
-
-future<> create_metadata_table_if_missing(
-        const sstring& table_name,
-        cql3::query_processor& qp,
-        const sstring& cql,
-        ::service::migration_manager& mm) {
-    auto& db = qp.db().local();
-
-    if (db.has_schema(meta::AUTH_KS, table_name)) {
-        return make_ready_future<>();
-    }
-
-    auto parsed_statement = static_pointer_cast<cql3::statements::raw::cf_statement>(
-            cql3::query_processor::parse_statement(cql));
-
-    parsed_statement->prepare_keyspace(meta::AUTH_KS);
-
-    auto statement = static_pointer_cast<cql3::statements::create_table_statement>(
-            parsed_statement->prepare(db, qp.get_cql_stats())->statement);
-
-    const auto schema = statement->get_cf_meta_data();
-    const auto uuid = generate_legacy_id(schema->ks_name(), schema->cf_name());
-
-    schema_builder b(schema);
-    b.set_uuid(uuid);
-
-    return mm.announce_new_column_family(b.build(), false);
-}
-
-}

auth/common.hh

@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2017 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 <chrono>
-
-#include <seastar/core/future.hh>
-#include <seastar/core/reactor.hh>
-#include <seastar/core/resource.hh>
-#include <seastar/core/sstring.hh>
-
-#include "delayed_tasks.hh"
-#include "seastarx.hh"
-
-namespace service {
-class migration_manager;
-}
-
-namespace cql3 {
-class query_processor;
-}
-
-namespace auth {
-
-namespace meta {
-
-extern const sstring DEFAULT_SUPERUSER_NAME;
-extern const sstring AUTH_KS;
-extern const sstring USERS_CF;
-extern const sstring AUTH_PACKAGE_NAME;
-
-}
-
-template <class Task>
-future<> once_among_shards(Task&& f) {
-    if (engine().cpu_id() == 0u) {
-        return f();
-    }
-
-    return make_ready_future<>();
-}
-
-template <class Task, class Clock>
-void delay_until_system_ready(delayed_tasks<Clock>& ts, Task&& f) {
-    static const typename std::chrono::milliseconds delay_duration(10000);
-    ts.schedule_after(delay_duration, std::forward<Task>(f));
-}
-
-future<> create_metadata_table_if_missing(
-        const sstring& table_name,
-        cql3::query_processor&,
-        const sstring& cql,
-        ::service::migration_manager&);
-
-}

auth/data_resource.cc

@@ -115,14 +115,16 @@ auth::data_resource auth::data_resource::get_parent() const {
     }
 }
 
-const sstring& auth::data_resource::keyspace() const {
+const sstring& auth::data_resource::keyspace() const
+                throw (std::invalid_argument) {
     if (is_root_level()) {
         throw std::invalid_argument("ROOT data resource has no keyspace");
     }
     return _ks;
 }
 
-const sstring& auth::data_resource::column_family() const {
+const sstring& auth::data_resource::column_family() const
+                throw (std::invalid_argument) {
     if (!is_column_family_level()) {
         throw std::invalid_argument(sprint("%s data resource has no column family", name()));
     }

auth/data_resource.hh

@@ -45,7 +45,6 @@
 #include <iosfwd>
 #include <set>
 #include <seastar/core/sstring.hh>
-#include "seastarx.hh"
 
 namespace auth {
 
@@ -118,13 +117,13 @@ public:
      * @return keyspace of the resource.
      * @throws std::invalid_argument if it's the root-level resource.
      */
-    const sstring& keyspace() const;
+    const sstring& keyspace() const throw(std::invalid_argument);
 
     /**
      * @return column family of the resource.
      * @throws std::invalid_argument if it's not a cf-level resource.
      */
-    const sstring& column_family() const;
+    const sstring& column_family() const throw(std::invalid_argument);
 
     /**
      * @return Whether or not the resource has a parent in the hierarchy.

auth/default_authorizer.cc

@@ -46,68 +46,46 @@
 
 #include <seastar/core/reactor.hh>
 
-#include "common.hh"
+#include "auth.hh"
 #include "default_authorizer.hh"
 #include "authenticated_user.hh"
 #include "permission.hh"
 #include "cql3/query_processor.hh"
-#include "cql3/untyped_result_set.hh"
 #include "exceptions/exceptions.hh"
 #include "log.hh"
 
-const sstring& auth::default_authorizer_name() {
-    static const sstring name = meta::AUTH_PACKAGE_NAME + "CassandraAuthorizer";
-    return name;
-}
+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 alogger("default_authorizer");
+static logging::logger logger("default_authorizer");
 
-// To ensure correct initialization order, we unfortunately need to use a string literal.
-static const class_registrator<
-        auth::authorizer,
-        auth::default_authorizer,
-        cql3::query_processor&,
-        ::service::migration_manager&> password_auth_reg("org.apache.cassandra.auth.CassandraAuthorizer");
-
-auth::default_authorizer::default_authorizer(cql3::query_processor& qp, ::service::migration_manager& mm)
-        : _qp(qp)
-        , _migration_manager(mm) {
+auth::default_authorizer::default_authorizer() {
 }
-
 auth::default_authorizer::~default_authorizer() {
 }
 
-future<> auth::default_authorizer::start() {
-    static const sstring create_table = sprint("CREATE TABLE %s.%s ("
+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", meta::AUTH_KS,
+                    ") 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::once_among_shards([this] {
-        return auth::create_metadata_table_if_missing(
-                PERMISSIONS_CF,
-                _qp,
-                create_table,
-                _migration_manager);
-    });
+    return auth::setup_table(PERMISSIONS_CF, create_table);
 }
 
-future<> auth::default_authorizer::stop() {
-    return make_ready_future<>();
-}
 
 future<auth::permission_set> auth::default_authorizer::authorize(
-                service& ser, ::shared_ptr<authenticated_user> user, data_resource resource) const {
-    return auth::is_super_user(ser, *user).then([this, user, resource = std::move(resource)](bool is_super) {
+                ::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);
         }
@@ -116,9 +94,10 @@ future<auth::permission_set> auth::default_authorizer::authorize(
          * 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, meta::AUTH_KS, PERMISSIONS_CF, USER_NAME, RESOURCE_NAME);
-        return _qp.process(query, db::consistency_level::LOCAL_ONE, {user->name(), resource.name() })
+                        , 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();
@@ -128,7 +107,7 @@ future<auth::permission_set> auth::default_authorizer::authorize(
                 }
                 return make_ready_future<permission_set>(permissions::from_strings(res->one().get_set<sstring>(PERMISSIONS_NAME)));
             } catch (exceptions::request_execution_exception& e) {
-                alogger.warn("CassandraAuthorizer failed to authorize {} for {}", user->name(), resource);
+                logger.warn("CassandraAuthorizer failed to authorize {} for {}", user->name(), resource);
                 return make_ready_future<permission_set>(permissions::NONE);
             }
         });
@@ -141,10 +120,11 @@ 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 = ?",
-                    meta::AUTH_KS, PERMISSIONS_CF, PERMISSIONS_NAME,
+                    auth::AUTH_KS, PERMISSIONS_CF, PERMISSIONS_NAME,
                     PERMISSIONS_NAME, op, USER_NAME, RESOURCE_NAME);
-    return _qp.process(query, db::consistency_level::ONE, {
+    return qp.process(query, db::consistency_level::ONE, {
                     permissions::to_strings(set), user, resource.name() }).discard_result();
 }
 
@@ -162,14 +142,15 @@ future<> auth::default_authorizer::revoke(
 }
 
 future<std::vector<auth::permission_details>> auth::default_authorizer::list(
-                service& ser, ::shared_ptr<authenticated_user> performer, permission_set set,
+                ::shared_ptr<authenticated_user> performer, permission_set set,
                 optional<data_resource> resource, optional<sstring> user) const {
-    return auth::is_super_user(ser, *performer).then([this, performer, set = std::move(set), resource = std::move(resource), user = std::move(user)](bool is_super) {
+    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, meta::AUTH_KS, PERMISSIONS_CF);
+        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.
@@ -177,15 +158,15 @@ future<std::vector<auth::permission_details>> auth::default_authorizer::list(
 
         if (resource && user) {
             query += sprint(" WHERE %s = ? AND %s = ?", USER_NAME, RESOURCE_NAME);
-            f = _qp.process(query, db::consistency_level::ONE, {*user, 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()});
+            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});
+            f = qp.process(query, db::consistency_level::ONE, {*user});
         } else {
-            f = _qp.process(query, db::consistency_level::ONE, {});
+            f = qp.process(query, db::consistency_level::ONE, {});
         }
 
         return f.then([set](::shared_ptr<cql3::untyped_result_set> res) {
@@ -207,40 +188,42 @@ future<std::vector<auth::permission_details>> auth::default_authorizer::list(
 }
 
 future<> auth::default_authorizer::revoke_all(sstring dropped_user) {
-    auto query = sprint("DELETE FROM %s.%s WHERE %s = ?", meta::AUTH_KS,
+    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(
+    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) {
-                            alogger.warn("CassandraAuthorizer failed to revoke all permissions of {}: {}", dropped_user, 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, meta::AUTH_KS, PERMISSIONS_CF, RESOURCE_NAME);
-    return _qp.process(query, db::consistency_level::LOCAL_ONE, { resource.name() })
-                    .then_wrapped([this, resource](future<::shared_ptr<cql3::untyped_result_set>> f) {
+                    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(), [this, res, resource](const cql3::untyped_result_set::row& r) {
+            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 = ?"
-                                , meta::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() })
+                                , 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) {
-                        alogger.warn("CassandraAuthorizer failed to revoke all permissions on {}: {}", resource, e);
+                        logger.warn("CassandraAuthorizer failed to revoke all permissions on {}: {}", resource, e);
                     }
 
                 });
             });
         } catch (exceptions::request_execution_exception& e) {
-            alogger.warn("CassandraAuthorizer failed to revoke all permissions on {}: {}", resource, e);
+            logger.warn("CassandraAuthorizer failed to revoke all permissions on {}: {}", resource, e);
             return make_ready_future();
         }
     });
@@ -248,7 +231,7 @@ future<> auth::default_authorizer::revoke_all(data_resource resource) {
 
 
 const auth::resource_ids& auth::default_authorizer::protected_resources() {
-    static const resource_ids ids({ data_resource(meta::AUTH_KS, PERMISSIONS_CF) });
+    static const resource_ids ids({ data_resource(auth::AUTH_KS, PERMISSIONS_CF) });
     return ids;
 }
 

auth/default_authorizer.hh

@@ -41,40 +41,26 @@
 
 #pragma once
 
-#include <functional>
-
 #include "authorizer.hh"
-#include "cql3/query_processor.hh"
-#include "service/migration_manager.hh"
 
 namespace auth {
 
-const sstring& default_authorizer_name();
-
 class default_authorizer : public authorizer {
-    cql3::query_processor& _qp;
-
-    ::service::migration_manager& _migration_manager;
-
 public:
-    default_authorizer(cql3::query_processor&, ::service::migration_manager&);
+    static const sstring DEFAULT_AUTHORIZER_NAME;
+
+    default_authorizer();
     ~default_authorizer();
 
-    future<> start() override;
+    future<> init();
 
-    future<> stop() override;
-
-    const sstring& qualified_java_name() const override {
-        return default_authorizer_name();
-    }
-
-    future<permission_set> authorize(service&, ::shared_ptr<authenticated_user>, data_resource) const override;
+    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(service&, ::shared_ptr<authenticated_user>, permission_set, optional<data_resource>, optional<sstring>) const 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;
 

auth/password_authenticator.cc

@@ -46,42 +46,28 @@
 
 #include <seastar/core/reactor.hh>
 
-#include "common.hh"
+#include "auth.hh"
 #include "password_authenticator.hh"
 #include "authenticated_user.hh"
-#include "cql3/untyped_result_set.hh"
+#include "cql3/query_processor.hh"
 #include "log.hh"
-#include "service/migration_manager.hh"
-#include "utils/class_registrator.hh"
 
-const sstring& auth::password_authenticator_name() {
-    static const sstring name = meta::AUTH_PACKAGE_NAME + "PasswordAuthenticator";
-    return name;
-}
+const sstring auth::password_authenticator::PASSWORD_AUTHENTICATOR_NAME("org.apache.cassandra.auth.PasswordAuthenticator");
 
 // name of the hash column.
 static const sstring SALTED_HASH = "salted_hash";
 static const sstring USER_NAME = "username";
-static const sstring DEFAULT_USER_NAME = auth::meta::DEFAULT_SUPERUSER_NAME;
-static const sstring DEFAULT_USER_PASSWORD = auth::meta::DEFAULT_SUPERUSER_NAME;
+static const sstring DEFAULT_USER_NAME = auth::auth::DEFAULT_SUPERUSER_NAME;
+static const sstring DEFAULT_USER_PASSWORD = auth::auth::DEFAULT_SUPERUSER_NAME;
 static const sstring CREDENTIALS_CF = "credentials";
 
-static logging::logger plogger("password_authenticator");
-
-// To ensure correct initialization order, we unfortunately need to use a string literal.
-static const class_registrator<
-        auth::authenticator,
-        auth::password_authenticator,
-        cql3::query_processor&,
-        ::service::migration_manager&> password_auth_reg("org.apache.cassandra.auth.PasswordAuthenticator");
+static logging::logger logger("password_authenticator");
 
 auth::password_authenticator::~password_authenticator()
 {}
 
-auth::password_authenticator::password_authenticator(cql3::query_processor& qp, ::service::migration_manager& mm)
-    : _qp(qp)
-    , _migration_manager(mm) {
-}
+auth::password_authenticator::password_authenticator()
+{}
 
 // TODO: blowfish
 // Origin uses Java bcrypt library, i.e. blowfish salt
@@ -102,10 +88,12 @@ auth::password_authenticator::password_authenticator(cql3::query_processor& qp,
 // and some old-fashioned random salt generation.
 
 static constexpr size_t rand_bytes = 16;
-static thread_local crypt_data tlcrypt = { 0, };
 
 static sstring hashpw(const sstring& pass, const sstring& salt) {
-    auto res = crypt_r(pass.c_str(), salt.c_str(), &tlcrypt);
+    // crypt_data is huge. should this be a thread_local static?
+    auto tmp = std::make_unique<crypt_data>();
+    tmp->initialized = 0;
+    auto res = crypt_r(pass.c_str(), salt.c_str(), tmp.get());
     if (res == nullptr) {
         throw std::system_error(errno, std::system_category());
     }
@@ -134,14 +122,17 @@ static sstring gensalt() {
     sstring salt;
 
     if (!prefix.empty()) {
-        return prefix + input;
+        return prefix + salt;
     }
 
+    auto tmp = std::make_unique<crypt_data>();
+    tmp->initialized = 0;
+
     // Try in order:
     // blowfish 2011 fix, blowfish, sha512, sha256, md5
     for (sstring pfx : { "$2y$", "$2a$", "$6$", "$5$", "$1$" }) {
         salt = pfx + input;
-        if (crypt_r("fisk", salt.c_str(), &tlcrypt)) {
+        if (crypt_r("fisk", salt.c_str(), tmp.get())) {
             prefix = pfx;
             return salt;
         }
@@ -153,52 +144,39 @@ static sstring hashpw(const sstring& pass) {
     return hashpw(pass, gensalt());
 }
 
-future<> auth::password_authenticator::start() {
-    return auth::once_among_shards([this] {
-        gensalt(); // do this once to determine usable hashing
+future<> auth::password_authenticator::init() {
+    gensalt(); // do this once to determine usable hashing
 
-        static const sstring create_table = sprint(
-                "CREATE TABLE %s.%s ("
-                "%s text,"
-                "%s text," // salt + hash + number of rounds
-                "options map<text,text>,"// for future extensions
-                "PRIMARY KEY(%s)"
-                ") WITH gc_grace_seconds=%d",
-                meta::AUTH_KS,
-                CREDENTIALS_CF, USER_NAME, SALTED_HASH, USER_NAME,
-                90 * 24 * 60 * 60); // 3 months.
+    sstring create_table = sprint(
+                    "CREATE TABLE %s.%s ("
+                                    "%s text,"
+                                    "%s text," // salt + hash + number of rounds
+                                    "options map<text,text>,"// for future extensions
+                                    "PRIMARY KEY(%s)"
+                                    ") WITH gc_grace_seconds=%d",
+                    auth::auth::AUTH_KS,
+                    CREDENTIALS_CF, USER_NAME, SALTED_HASH, USER_NAME,
+                    90 * 24 * 60 * 60); // 3 months.
 
-        return auth::create_metadata_table_if_missing(
-                CREDENTIALS_CF,
-                _qp,
-                create_table,
-                _migration_manager).then([this] {
-            auth::delay_until_system_ready(_delayed, [this] {
-                return has_existing_users().then([this](bool existing) {
-                    if (!existing) {
-                        return _qp.process(
-                                sprint(
-                                        "INSERT INTO %s.%s (%s, %s) VALUES (?, ?) USING TIMESTAMP 0",
-                                        meta::AUTH_KS,
-                                        CREDENTIALS_CF,
-                                        USER_NAME, SALTED_HASH),
-                                db::consistency_level::ONE,
-                                { DEFAULT_USER_NAME, hashpw(DEFAULT_USER_PASSWORD) }).then([](auto) {
-                            plogger.info("Created default user '{}'", DEFAULT_USER_NAME);
-                        });
-                    }
-
-                    return make_ready_future<>();
-                });
+    return auth::setup_table(CREDENTIALS_CF, create_table).then([this] {
+        // instead of once-timer, just schedule this later
+        auth::schedule_when_up([] {
+            return auth::has_existing_users(CREDENTIALS_CF, DEFAULT_USER_NAME, USER_NAME).then([](bool exists) {
+                if (!exists) {
+                    cql3::get_local_query_processor().process(sprint("INSERT INTO %s.%s (%s, %s) VALUES (?, ?) USING TIMESTAMP 0",
+                                                    auth::AUTH_KS,
+                                                    CREDENTIALS_CF,
+                                                    USER_NAME, SALTED_HASH
+                                    ),
+                                    db::consistency_level::ONE, {DEFAULT_USER_NAME, hashpw(DEFAULT_USER_PASSWORD)}).then([](auto) {
+                                        logger.info("Created default user '{}'", DEFAULT_USER_NAME);
+                                    });
+                }
             });
         });
     });
 }
 
-future<> auth::password_authenticator::stop() {
-    return make_ready_future<>();
-}
-
 db::consistency_level auth::password_authenticator::consistency_for_user(const sstring& username) {
     if (username == DEFAULT_USER_NAME) {
         return db::consistency_level::QUORUM;
@@ -206,8 +184,8 @@ db::consistency_level auth::password_authenticator::consistency_for_user(const s
     return db::consistency_level::LOCAL_ONE;
 }
 
-const sstring& auth::password_authenticator::qualified_java_name() const {
-    return password_authenticator_name();
+const sstring& auth::password_authenticator::class_name() const {
+    return PASSWORD_AUTHENTICATOR_NAME;
 }
 
 bool auth::password_authenticator::require_authentication() const {
@@ -223,7 +201,8 @@ auth::authenticator::option_set auth::password_authenticator::alterable_options(
 }
 
 future<::shared_ptr<auth::authenticated_user> > auth::password_authenticator::authenticate(
-                const credentials_map& credentials) const {
+                const credentials_map& credentials) const
+                                throw (exceptions::authentication_exception) {
     if (!credentials.count(USERNAME_KEY)) {
         throw exceptions::authentication_exception(sprint("Required key '%s' is missing", USERNAME_KEY));
     }
@@ -240,8 +219,9 @@ future<::shared_ptr<auth::authenticated_user> > auth::password_authenticator::au
     // Rely on query processing caching statements instead, and lets assume
     // that a map lookup string->statement is not gonna kill us much.
     return futurize_apply([this, username, password] {
-        return _qp.process(sprint("SELECT %s FROM %s.%s WHERE %s = ?", SALTED_HASH,
-                                        meta::AUTH_KS, CREDENTIALS_CF, USER_NAME),
+        auto& qp = cql3::get_local_query_processor();
+        return qp.process(sprint("SELECT %s FROM %s.%s WHERE %s = ?", SALTED_HASH,
+                                        auth::AUTH_KS, CREDENTIALS_CF, USER_NAME),
                         consistency_for_user(username), {username}, true);
     }).then_wrapped([=](future<::shared_ptr<cql3::untyped_result_set>> f) {
         try {
@@ -261,50 +241,58 @@ future<::shared_ptr<auth::authenticated_user> > auth::password_authenticator::au
 }
 
 future<> auth::password_authenticator::create(sstring username,
-                const option_map& options) {
+                const option_map& options)
+                                throw (exceptions::request_validation_exception,
+                                exceptions::request_execution_exception) {
     try {
         auto password = boost::any_cast<sstring>(options.at(option::PASSWORD));
         auto query = sprint("INSERT INTO %s.%s (%s, %s) VALUES (?, ?)",
-                        meta::AUTH_KS, CREDENTIALS_CF, USER_NAME, SALTED_HASH);
-        return _qp.process(query, consistency_for_user(username), { username, hashpw(password) }).discard_result();
+                        auth::AUTH_KS, CREDENTIALS_CF, USER_NAME, SALTED_HASH);
+        auto& qp = cql3::get_local_query_processor();
+        return qp.process(query, consistency_for_user(username), { username, hashpw(password) }).discard_result();
     } catch (std::out_of_range&) {
         throw exceptions::invalid_request_exception("PasswordAuthenticator requires PASSWORD option");
     }
 }
 
 future<> auth::password_authenticator::alter(sstring username,
-                const option_map& options) {
+                const option_map& options)
+                                throw (exceptions::request_validation_exception,
+                                exceptions::request_execution_exception) {
     try {
         auto password = boost::any_cast<sstring>(options.at(option::PASSWORD));
         auto query = sprint("UPDATE %s.%s SET %s = ? WHERE %s = ?",
-                        meta::AUTH_KS, CREDENTIALS_CF, SALTED_HASH, USER_NAME);
-        return _qp.process(query, consistency_for_user(username), { hashpw(password), username }).discard_result();
+                        auth::AUTH_KS, CREDENTIALS_CF, SALTED_HASH, USER_NAME);
+        auto& qp = cql3::get_local_query_processor();
+        return qp.process(query, consistency_for_user(username), { hashpw(password), username }).discard_result();
     } catch (std::out_of_range&) {
         throw exceptions::invalid_request_exception("PasswordAuthenticator requires PASSWORD option");
     }
 }
 
-future<> auth::password_authenticator::drop(sstring username) {
+future<> auth::password_authenticator::drop(sstring username)
+                throw (exceptions::request_validation_exception,
+                exceptions::request_execution_exception) {
     try {
         auto query = sprint("DELETE FROM %s.%s WHERE %s = ?",
-                        meta::AUTH_KS, CREDENTIALS_CF, USER_NAME);
-        return _qp.process(query, consistency_for_user(username), { username }).discard_result();
+                        auth::AUTH_KS, CREDENTIALS_CF, USER_NAME);
+        auto& qp = cql3::get_local_query_processor();
+        return qp.process(query, consistency_for_user(username), { username }).discard_result();
     } catch (std::out_of_range&) {
         throw exceptions::invalid_request_exception("PasswordAuthenticator requires PASSWORD option");
     }
 }
 
 const auth::resource_ids& auth::password_authenticator::protected_resources() const {
-    static const resource_ids ids({ data_resource(meta::AUTH_KS, CREDENTIALS_CF) });
+    static const resource_ids ids({ data_resource(auth::AUTH_KS, CREDENTIALS_CF) });
     return ids;
 }
 
 ::shared_ptr<auth::authenticator::sasl_challenge> auth::password_authenticator::new_sasl_challenge() const {
     class plain_text_password_challenge: public sasl_challenge {
-        const password_authenticator& _self;
-
     public:
-        plain_text_password_challenge(const password_authenticator& self) : _self(self)
+        plain_text_password_challenge(const password_authenticator& a)
+                        : _authenticator(a)
         {}
 
         /**
@@ -320,8 +308,9 @@ const auth::resource_ids& auth::password_authenticator::protected_resources() co
          * would expect
          * @throws javax.security.sasl.SaslException
          */
-        bytes evaluate_response(bytes_view client_response) override {
-            plogger.debug("Decoding credentials from client token");
+        bytes evaluate_response(bytes_view client_response)
+                        throw (exceptions::authentication_exception) override {
+            logger.debug("Decoding credentials from client token");
 
             sstring username, password;
 
@@ -358,59 +347,14 @@ const auth::resource_ids& auth::password_authenticator::protected_resources() co
         bool is_complete() const override {
             return _complete;
         }
-        future<::shared_ptr<authenticated_user>> get_authenticated_user() const override {
-            return _self.authenticate(_credentials);
+        future<::shared_ptr<authenticated_user>> get_authenticated_user() const
+                        throw (exceptions::authentication_exception) override {
+            return _authenticator.authenticate(_credentials);
         }
     private:
+        const password_authenticator& _authenticator;
         credentials_map _credentials;
         bool _complete = false;
     };
     return ::make_shared<plain_text_password_challenge>(*this);
 }
-
-
-//
-// Similar in structure to `auth::service::has_existing_users()`, but trying to generalize the pattern breaks all kinds
-// of module boundaries and leaks implementation details.
-//
-future<bool> auth::password_authenticator::has_existing_users() const {
-    static const sstring default_user_query = sprint(
-            "SELECT * FROM %s.%s WHERE %s = ?",
-            meta::AUTH_KS,
-            CREDENTIALS_CF,
-            USER_NAME);
-
-    static const sstring all_users_query = sprint(
-            "SELECT * FROM %s.%s LIMIT 1",
-            meta::AUTH_KS,
-            CREDENTIALS_CF);
-
-    // This logic is borrowed directly from Apache Cassandra. By first checking for the presence of the default user, we
-    // can potentially avoid doing a range query with a high consistency level.
-
-    return _qp.process(
-            default_user_query,
-            db::consistency_level::ONE,
-            { meta::DEFAULT_SUPERUSER_NAME },
-            true).then([this](auto results) {
-        if (!results->empty()) {
-            return make_ready_future<bool>(true);
-        }
-
-        return _qp.process(
-                default_user_query,
-                db::consistency_level::QUORUM,
-                { meta::DEFAULT_SUPERUSER_NAME },
-                true).then([this](auto results) {
-            if (!results->empty()) {
-                return make_ready_future<bool>(true);
-            }
-
-            return _qp.process(
-                    all_users_query,
-                    db::consistency_level::QUORUM).then([](auto results) {
-                return make_ready_future<bool>(!results->empty());
-            });
-        });
-    });
-}

auth/password_authenticator.hh

@@ -42,48 +42,31 @@
 #pragma once
 
 #include "authenticator.hh"
-#include "cql3/query_processor.hh"
-#include "delayed_tasks.hh"
-
-namespace service {
-class migration_manager;
-}
 
 namespace auth {
 
-const sstring& password_authenticator_name();
-
 class password_authenticator : public authenticator {
-    cql3::query_processor& _qp;
-
-    ::service::migration_manager& _migration_manager;
-
-    delayed_tasks<> _delayed{};
-
 public:
-    password_authenticator(cql3::query_processor&, ::service::migration_manager&);
+    static const sstring PASSWORD_AUTHENTICATOR_NAME;
+
+    password_authenticator();
     ~password_authenticator();
 
-    future<> start() override;
+    future<> init();
 
-    future<> stop() override;
-
-    const sstring& qualified_java_name() const override;
+    const sstring& class_name() const override;
     bool require_authentication() const override;
     option_set supported_options() const override;
     option_set alterable_options() const override;
-    future<::shared_ptr<authenticated_user>> authenticate(const credentials_map& credentials) const override;
-    future<> create(sstring username, const option_map& options) override;
-    future<> alter(sstring username, const option_map& options) override;
-    future<> drop(sstring username) override;
+    future<::shared_ptr<authenticated_user>> authenticate(const credentials_map& credentials) const throw(exceptions::authentication_exception) override;
+    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;
     ::shared_ptr<sasl_challenge> new_sasl_challenge() const override;
 
 
     static db::consistency_level consistency_for_user(const sstring& username);
-
-private:
-    future<bool> has_existing_users() const;
 };
 
 }

auth/permission.hh

@@ -44,7 +44,6 @@
 #include <unordered_set>
 #include <seastar/core/sstring.hh>
 
-#include "seastarx.hh"
 #include "enum_set.hh"
 
 namespace auth {

auth/permissions_cache.cc

@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2017 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 "auth/permissions_cache.hh"
-
-#include "auth/authorizer.hh"
-#include "auth/common.hh"
-#include "auth/service.hh"
-#include "db/config.hh"
-
-namespace auth {
-
-permissions_cache_config permissions_cache_config::from_db_config(const db::config& dc) {
-    permissions_cache_config c;
-    c.max_entries = dc.permissions_cache_max_entries();
-    c.validity_period = std::chrono::milliseconds(dc.permissions_validity_in_ms());
-    c.update_period = std::chrono::milliseconds(dc.permissions_update_interval_in_ms());
-
-    return c;
-}
-
-permissions_cache::permissions_cache(const permissions_cache_config& c, service& ser, logging::logger& log)
-        : _cache(c.max_entries, c.validity_period, c.update_period, log, [&ser, &log](const key_type& k) {
-              log.debug("Refreshing permissions for {}", k.first.name());
-              return ser.underlying_authorizer().authorize(ser, ::make_shared<authenticated_user>(k.first), k.second);
-          }) {
-}
-
-future<permission_set> permissions_cache::get(::shared_ptr<authenticated_user> user, data_resource r) {
-    return _cache.get(key_type(*user, r));
-}
-
-}

auth/permissions_cache.hh

@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2017 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 <chrono>
-#include <functional>
-#include <iostream>
-#include <utility>
-
-#include <seastar/core/future.hh>
-#include <seastar/core/shared_ptr.hh>
-
-#include "auth/authenticated_user.hh"
-#include "auth/data_resource.hh"
-#include "auth/permission.hh"
-#include "log.hh"
-#include "utils/loading_cache.hh"
-
-namespace std {
-
-template <>
-struct hash<auth::data_resource> final {
-    size_t operator()(const auth::data_resource & v) const {
-        return v.hash_value();
-    }
-};
-
-template <>
-struct hash<auth::authenticated_user> final {
-    size_t operator()(const auth::authenticated_user & v) const {
-        return utils::tuple_hash()(v.name(), v.is_anonymous());
-    }
-};
-
-inline std::ostream& operator<<(std::ostream& os, const std::pair<auth::authenticated_user, auth::data_resource>& p) {
-    os << "{user: " << p.first.name() << ", data_resource: " << p.second << "}";
-    return os;
-}
-
-}
-
-namespace db {
-class config;
-}
-
-namespace auth {
-
-class service;
-
-struct permissions_cache_config final {
-    static permissions_cache_config from_db_config(const db::config&);
-
-    std::size_t max_entries;
-    std::chrono::milliseconds validity_period;
-    std::chrono::milliseconds update_period;
-};
-
-class permissions_cache final {
-    using cache_type = utils::loading_cache<
-            std::pair<authenticated_user, data_resource>,
-            permission_set,
-            utils::loading_cache_reload_enabled::yes,
-            utils::simple_entry_size<permission_set>,
-            utils::tuple_hash>;
-
-    using key_type = typename cache_type::key_type;
-
-    cache_type _cache;
-
-public:
-    explicit permissions_cache(const permissions_cache_config&, service&, logging::logger&);
-
-    future <> stop() {
-        return _cache.stop();
-    }
-
-    future<permission_set> get(::shared_ptr<authenticated_user>, data_resource);
-};
-
-}

auth/service.cc

@@ -1,355 +0,0 @@
-/*
- * Copyright (C) 2017 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 "auth/service.hh"
-
-#include <map>
-
-#include <seastar/core/future-util.hh>
-#include <seastar/core/shared_ptr.hh>
-
-#include "auth/allow_all_authenticator.hh"
-#include "auth/allow_all_authorizer.hh"
-#include "auth/common.hh"
-#include "cql3/query_processor.hh"
-#include "cql3/untyped_result_set.hh"
-#include "db/config.hh"
-#include "db/consistency_level.hh"
-#include "exceptions/exceptions.hh"
-#include "log.hh"
-#include "service/migration_listener.hh"
-#include "utils/class_registrator.hh"
-
-namespace auth {
-
-namespace meta {
-
-static const sstring user_name_col_name("name");
-static const sstring superuser_col_name("super");
-
-}
-
-static logging::logger log("auth_service");
-
-class auth_migration_listener final : public ::service::migration_listener {
-    authorizer& _authorizer;
-
-public:
-    explicit auth_migration_listener(authorizer& a) : _authorizer(a) {
-    }
-
-private:
-    void on_create_keyspace(const sstring& ks_name) override {}
-    void on_create_column_family(const sstring& ks_name, const sstring& cf_name) override {}
-    void on_create_user_type(const sstring& ks_name, const sstring& type_name) override {}
-    void on_create_function(const sstring& ks_name, const sstring& function_name) override {}
-    void on_create_aggregate(const sstring& ks_name, const sstring& aggregate_name) override {}
-    void on_create_view(const sstring& ks_name, const sstring& view_name) override {}
-
-    void on_update_keyspace(const sstring& ks_name) override {}
-    void on_update_column_family(const sstring& ks_name, const sstring& cf_name, bool) override {}
-    void on_update_user_type(const sstring& ks_name, const sstring& type_name) override {}
-    void on_update_function(const sstring& ks_name, const sstring& function_name) override {}
-    void on_update_aggregate(const sstring& ks_name, const sstring& aggregate_name) override {}
-    void on_update_view(const sstring& ks_name, const sstring& view_name, bool columns_changed) override {}
-
-    void on_drop_keyspace(const sstring& ks_name) override {
-        _authorizer.revoke_all(auth::data_resource(ks_name));
-    }
-
-    void on_drop_column_family(const sstring& ks_name, const sstring& cf_name) override {
-        _authorizer.revoke_all(auth::data_resource(ks_name, cf_name));
-    }
-
-    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 {}
-    void on_drop_aggregate(const sstring& ks_name, const sstring& aggregate_name) override {}
-    void on_drop_view(const sstring& ks_name, const sstring& view_name) override {}
-};
-
-static db::consistency_level consistency_for_user(const sstring& name) {
-    if (name == meta::DEFAULT_SUPERUSER_NAME) {
-        return db::consistency_level::QUORUM;
-    } else {
-        return db::consistency_level::LOCAL_ONE;
-    }
-}
-
-static future<::shared_ptr<cql3::untyped_result_set>> select_user(cql3::query_processor& qp, const sstring& name) {
-    // Here was a thread local, explicit cache of prepared statement. In normal execution this is
-    // fine, but since we in testing set up and tear down system over and over, we'd start using
-    // obsolete prepared statements pretty quickly.
-    // Rely on query processing caching statements instead, and lets assume
-    // that a map lookup string->statement is not gonna kill us much.
-    return qp.process(
-            sprint(
-                    "SELECT * FROM %s.%s WHERE %s = ?",
-                    meta::AUTH_KS,
-                    meta::USERS_CF,
-                    meta::user_name_col_name),
-            consistency_for_user(name),
-            { name },
-            true);
-}
-
-service_config service_config::from_db_config(const db::config& dc) {
-    const qualified_name qualified_authorizer_name(meta::AUTH_PACKAGE_NAME, dc.authorizer());
-    const qualified_name qualified_authenticator_name(meta::AUTH_PACKAGE_NAME, dc.authenticator());
-
-    service_config c;
-    c.authorizer_java_name = qualified_authorizer_name;
-    c.authenticator_java_name = qualified_authenticator_name;
-
-    return c;
-}
-
-service::service(
-        permissions_cache_config c,
-        cql3::query_processor& qp,
-        ::service::migration_manager& mm,
-        std::unique_ptr<authorizer> a,
-        std::unique_ptr<authenticator> b)
-            : _permissions_cache_config(std::move(c))
-            , _permissions_cache(nullptr)
-            , _qp(qp)
-            , _migration_manager(mm)
-            , _authorizer(std::move(a))
-            , _authenticator(std::move(b))
-            , _migration_listener(std::make_unique<auth_migration_listener>(*_authorizer)) {
-}
-
-service::service(
-        permissions_cache_config cache_config,
-        cql3::query_processor& qp,
-        ::service::migration_manager& mm,
-        const service_config& sc)
-            : service(
-                      std::move(cache_config),
-                      qp,
-                      mm,
-                      create_object<authorizer>(sc.authorizer_java_name, qp, mm),
-                      create_object<authenticator>(sc.authenticator_java_name, qp, mm)) {
-}
-
-bool service::should_create_metadata() const {
-    const bool null_authorizer = _authorizer->qualified_java_name() == allow_all_authorizer_name();
-    const bool null_authenticator = _authenticator->qualified_java_name() == allow_all_authenticator_name();
-    return !null_authorizer || !null_authenticator;
-}
-
-future<> service::create_metadata_if_missing() {
-    auto& db = _qp.db().local();
-
-    auto f = make_ready_future<>();
-
-    if (!db.has_keyspace(meta::AUTH_KS)) {
-        std::map<sstring, sstring> opts{{"replication_factor", "1"}};
-
-        auto ksm = keyspace_metadata::new_keyspace(
-                meta::AUTH_KS,
-                "org.apache.cassandra.locator.SimpleStrategy",
-                opts,
-                true);
-
-        // We use min_timestamp so that default keyspace metadata will loose with any manual adjustments.
-        // See issue #2129.
-        f = _migration_manager.announce_new_keyspace(ksm, api::min_timestamp, false);
-    }
-
-    return f.then([this] {
-        // 3 months.
-        static const auto gc_grace_seconds = 90 * 24 * 60 * 60;
-
-        static const sstring users_table_query = sprint(
-                "CREATE TABLE %s.%s (%s text, %s boolean, PRIMARY KEY (%s)) WITH gc_grace_seconds=%s",
-                meta::AUTH_KS,
-                meta::USERS_CF,
-                meta::user_name_col_name,
-                meta::superuser_col_name,
-                meta::user_name_col_name,
-                gc_grace_seconds);
-
-        return create_metadata_table_if_missing(
-                meta::USERS_CF,
-                _qp,
-                users_table_query,
-                _migration_manager);
-    }).then([this] {
-        delay_until_system_ready(_delayed, [this] {
-            return has_existing_users().then([this](bool existing) {
-                if (!existing) {
-                    //
-                    // Create default superuser.
-                    //
-
-                    static const sstring query = sprint(
-                            "INSERT INTO %s.%s (%s, %s) VALUES (?, ?) USING TIMESTAMP 0",
-                            meta::AUTH_KS,
-                            meta::USERS_CF,
-                            meta::user_name_col_name,
-                            meta::superuser_col_name);
-
-                    return _qp.process(
-                            query,
-                            db::consistency_level::ONE,
-                            { meta::DEFAULT_SUPERUSER_NAME, true }).then([](auto&&) {
-                        log.info("Created default superuser '{}'", meta::DEFAULT_SUPERUSER_NAME);
-                    }).handle_exception([](auto exn) {
-                        try {
-                            std::rethrow_exception(exn);
-                        } catch (const exceptions::request_execution_exception&) {
-                            log.warn("Skipped default superuser setup: some nodes were not ready");
-                        }
-                    }).discard_result();
-                }
-
-                return make_ready_future<>();
-            });
-        });
-
-        return make_ready_future<>();
-    });
-}
-
-future<> service::start() {
-    return once_among_shards([this] {
-        if (should_create_metadata()) {
-            return create_metadata_if_missing();
-        }
-
-        return make_ready_future<>();
-    }).then([this] {
-        return when_all_succeed(_authorizer->start(), _authenticator->start());
-    }).then([this] {
-        _permissions_cache = std::make_unique<permissions_cache>(_permissions_cache_config, *this, log);
-    }).then([this] {
-        return once_among_shards([this] {
-            _migration_manager.register_listener(_migration_listener.get());
-            return make_ready_future<>();
-        });
-    });
-}
-
-future<> service::stop() {
-    return once_among_shards([this] {
-        _delayed.cancel_all();
-        return make_ready_future<>();
-    }).then([this] {
-        return _permissions_cache->stop();
-    }).then([this] {
-        return when_all_succeed(_authorizer->stop(), _authenticator->stop());
-    });
-}
-
-future<bool> service::has_existing_users() const {
-    static const sstring default_user_query = sprint(
-            "SELECT * FROM %s.%s WHERE %s = ?",
-            meta::AUTH_KS,
-            meta::USERS_CF,
-            meta::user_name_col_name);
-
-    static const sstring all_users_query = sprint(
-            "SELECT * FROM %s.%s LIMIT 1",
-            meta::AUTH_KS,
-            meta::USERS_CF);
-
-    // This logic is borrowed directly from Apache Cassandra. By first checking for the presence of the default user, we
-    // can potentially avoid doing a range query with a high consistency level.
-
-    return _qp.process(
-            default_user_query,
-            db::consistency_level::ONE,
-            { meta::DEFAULT_SUPERUSER_NAME },
-            true).then([this](auto results) {
-        if (!results->empty()) {
-            return make_ready_future<bool>(true);
-        }
-
-        return _qp.process(
-                default_user_query,
-                db::consistency_level::QUORUM,
-                { meta::DEFAULT_SUPERUSER_NAME },
-                true).then([this](auto results) {
-            if (!results->empty()) {
-                return make_ready_future<bool>(true);
-            }
-
-            return _qp.process(
-                    all_users_query,
-                    db::consistency_level::QUORUM).then([](auto results) {
-                return make_ready_future<bool>(!results->empty());
-            });
-        });
-    });
-}
-
-future<bool> service::is_existing_user(const sstring& name) const {
-    return select_user(_qp, name).then([](auto results) {
-        return !results->empty();
-    });
-}
-
-future<bool> service::is_super_user(const sstring& name) const {
-    return select_user(_qp, name).then([](auto results) {
-        return !results->empty() && results->one().template get_as<bool>(meta::superuser_col_name);
-    });
-}
-
-future<> service::insert_user(const sstring& name, bool is_superuser) {
-    return _qp.process(
-            sprint(
-                    "INSERT INTO %s.%s (%s, %s) VALUES (?, ?)",
-                    meta::AUTH_KS,
-                    meta::USERS_CF,
-                    meta::user_name_col_name,
-                    meta::superuser_col_name),
-            consistency_for_user(name),
-            { name, is_superuser }).discard_result();
-}
-
-future<> service::delete_user(const sstring& name) {
-    return _qp.process(
-            sprint(
-                    "DELETE FROM %s.%s WHERE %s = ?",
-                    meta::AUTH_KS,
-                    meta::USERS_CF,
-                    meta::user_name_col_name),
-            consistency_for_user(name),
-            { name }).discard_result();
-}
-
-future<permission_set> service::get_permissions(::shared_ptr<authenticated_user> u, data_resource r) const {
-    return _permissions_cache->get(std::move(u), std::move(r));
-}
-
-//
-// Free functions.
-//
-
-future<bool> is_super_user(const service& ser, const authenticated_user& u) {
-    if (u.is_anonymous()) {
-        return make_ready_future<bool>(false);
-    }
-
-    return ser.is_super_user(u.name());
-}
-
-}

auth/service.hh

@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2017 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 <memory>
-
-#include <seastar/core/future.hh>
-#include <seastar/core/sstring.hh>
-
-#include "auth/authenticator.hh"
-#include "auth/authorizer.hh"
-#include "auth/authenticated_user.hh"
-#include "auth/permission.hh"
-#include "auth/permissions_cache.hh"
-#include "delayed_tasks.hh"
-#include "seastarx.hh"
-
-namespace cql3 {
-class query_processor;
-}
-
-namespace db {
-class config;
-}
-
-namespace service {
-class migration_manager;
-class migration_listener;
-}
-
-namespace auth {
-
-class authenticator;
-class authorizer;
-
-struct service_config final {
-    static service_config from_db_config(const db::config&);
-
-    sstring authorizer_java_name;
-    sstring authenticator_java_name;
-};
-
-class service final {
-    permissions_cache_config _permissions_cache_config;
-    std::unique_ptr<permissions_cache> _permissions_cache;
-
-    cql3::query_processor& _qp;
-
-    ::service::migration_manager& _migration_manager;
-
-    std::unique_ptr<authorizer> _authorizer;
-
-    std::unique_ptr<authenticator> _authenticator;
-
-    // Only one of these should be registered, so we end up with some unused instances. Not the end of the world.
-    std::unique_ptr<::service::migration_listener> _migration_listener;
-
-    delayed_tasks<> _delayed{};
-
-public:
-    service(
-            permissions_cache_config,
-            cql3::query_processor&,
-            ::service::migration_manager&,
-            std::unique_ptr<authorizer>,
-            std::unique_ptr<authenticator>);
-
-    service(
-            permissions_cache_config,
-            cql3::query_processor&,
-            ::service::migration_manager&,
-            const service_config&);
-
-    future<> start();
-
-    future<> stop();
-
-    future<bool> is_existing_user(const sstring& name) const;
-
-    future<bool> is_super_user(const sstring& name) const;
-
-    future<> insert_user(const sstring& name, bool is_superuser);
-
-    future<> delete_user(const sstring& name);
-
-    future<permission_set> get_permissions(::shared_ptr<authenticated_user>, data_resource) const;
-
-    authenticator& underlying_authenticator() {
-        return *_authenticator;
-    }
-
-    const authenticator& underlying_authenticator() const {
-        return *_authenticator;
-    }
-
-    authorizer& underlying_authorizer() {
-        return *_authorizer;
-    }
-
-    const authorizer& underlying_authorizer() const {
-        return *_authorizer;
-    }
-
-private:
-    future<bool> has_existing_users() const;
-
-    bool should_create_metadata() const;
-
-    future<> create_metadata_if_missing();
-};
-
-future<bool> is_super_user(const service&, const authenticated_user&);
-
-}

auth/transitional.cc

@@ -1,232 +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) 2017 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 "authenticator.hh"
-#include "authenticated_user.hh"
-#include "authenticator.hh"
-#include "authorizer.hh"
-#include "password_authenticator.hh"
-#include "default_authorizer.hh"
-#include "permission.hh"
-#include "db/config.hh"
-#include "utils/class_registrator.hh"
-
-namespace auth {
-
-class service;
-
-static const sstring PACKAGE_NAME("com.scylladb.auth.");
-
-static const sstring& transitional_authenticator_name() {
-    static const sstring name = PACKAGE_NAME + "TransitionalAuthenticator";
-    return name;
-}
-
-static const sstring& transitional_authorizer_name() {
-    static const sstring name = PACKAGE_NAME + "TransitionalAuthorizer";
-    return name;
-}
-
-class transitional_authenticator : public authenticator {
-    std::unique_ptr<authenticator> _authenticator;
-public:
-    static const sstring PASSWORD_AUTHENTICATOR_NAME;
-
-    transitional_authenticator(cql3::query_processor& qp, ::service::migration_manager& mm)
-            : transitional_authenticator(std::make_unique<password_authenticator>(qp, mm))
-    {}
-    transitional_authenticator(std::unique_ptr<authenticator> a)
-        : _authenticator(std::move(a))
-    {}
-    future<> start() override {
-        return _authenticator->start();
-    }
-    future<> stop() override {
-        return _authenticator->stop();
-    }
-    const sstring& qualified_java_name() const override {
-        return transitional_authenticator_name();
-    }
-    bool require_authentication() const override {
-        return true;
-    }
-    option_set supported_options() const override {
-        return _authenticator->supported_options();
-    }
-    option_set alterable_options() const override {
-        return _authenticator->alterable_options();
-    }
-    future<::shared_ptr<authenticated_user>> authenticate(const credentials_map& credentials) const override {
-        auto i = credentials.find(authenticator::USERNAME_KEY);
-        if ((i == credentials.end() || i->second.empty()) && (!credentials.count(PASSWORD_KEY) || credentials.at(PASSWORD_KEY).empty())) {
-            // return anon user
-            return make_ready_future<::shared_ptr<authenticated_user>>(::make_shared<authenticated_user>());
-        }
-        return make_ready_future().then([this, &credentials] {
-            return _authenticator->authenticate(credentials);
-        }).handle_exception([](auto ep) {
-            try {
-                std::rethrow_exception(ep);
-            } catch (exceptions::authentication_exception&) {
-                // return anon user
-                return make_ready_future<::shared_ptr<authenticated_user>>(::make_shared<authenticated_user>());
-            }
-        });
-    }
-    future<> create(sstring username, const option_map& options) override {
-        return _authenticator->create(username, options);
-    }
-    future<> alter(sstring username, const option_map& options) override {
-        return _authenticator->alter(username, options);
-    }
-    future<> drop(sstring username) override {
-        return _authenticator->drop(username);
-    }
-    const resource_ids& protected_resources() const override {
-        return _authenticator->protected_resources();
-    }
-    ::shared_ptr<sasl_challenge> new_sasl_challenge() const override {
-        class sasl_wrapper : public sasl_challenge {
-        public:
-            sasl_wrapper(::shared_ptr<sasl_challenge> sasl)
-                : _sasl(std::move(sasl))
-            {}
-            bytes evaluate_response(bytes_view client_response) override {
-                try {
-                    return _sasl->evaluate_response(client_response);
-                } catch (exceptions::authentication_exception&) {
-                    _complete = true;
-                    return {};
-                }
-            }
-            bool is_complete() const {
-                return _complete || _sasl->is_complete();
-            }
-            future<::shared_ptr<authenticated_user>> get_authenticated_user() const {
-                return futurize_apply([this] {
-                    return _sasl->get_authenticated_user().handle_exception([](auto ep) {
-                        try {
-                            std::rethrow_exception(ep);
-                        } catch (exceptions::authentication_exception&) {
-                            // return anon user
-                            return make_ready_future<::shared_ptr<authenticated_user>>(::make_shared<authenticated_user>());
-                        }
-                    });
-                });
-            }
-        private:
-            ::shared_ptr<sasl_challenge> _sasl;
-            bool _complete = false;
-        };
-        return ::make_shared<sasl_wrapper>(_authenticator->new_sasl_challenge());
-    }
-};
-
-class transitional_authorizer : public authorizer {
-    std::unique_ptr<authorizer> _authorizer;
-public:
-    transitional_authorizer(cql3::query_processor& qp, ::service::migration_manager& mm)
-        : transitional_authorizer(std::make_unique<default_authorizer>(qp, mm))
-    {}
-    transitional_authorizer(std::unique_ptr<authorizer> a)
-        : _authorizer(std::move(a))
-    {}
-    ~transitional_authorizer()
-    {}
-    future<> start() override {
-        return _authorizer->start();
-    }
-    future<> stop() override {
-        return _authorizer->stop();
-    }
-    const sstring& qualified_java_name() const override {
-        return transitional_authorizer_name();
-    }
-    future<permission_set> authorize(service& ser, ::shared_ptr<authenticated_user> user, data_resource resource) const override {
-        return is_super_user(ser, *user).then([](bool s) {
-            static const permission_set transitional_permissions =
-                            permission_set::of<permission::CREATE,
-                                            permission::ALTER, permission::DROP,
-                                            permission::SELECT, permission::MODIFY>();
-
-            return make_ready_future<permission_set>(s ? permissions::ALL : transitional_permissions);
-        });
-    }
-    future<> grant(::shared_ptr<authenticated_user> user, permission_set ps, data_resource r, sstring s) override {
-        return _authorizer->grant(std::move(user), std::move(ps), std::move(r), std::move(s));
-    }
-    future<> revoke(::shared_ptr<authenticated_user> user, permission_set ps, data_resource r, sstring s) override {
-        return _authorizer->revoke(std::move(user), std::move(ps), std::move(r), std::move(s));
-    }
-    future<std::vector<permission_details>> list(service& ser, ::shared_ptr<authenticated_user> user, permission_set ps, optional<data_resource> r, optional<sstring> s) const override {
-        return _authorizer->list(ser, std::move(user), std::move(ps), std::move(r), std::move(s));
-    }
-    future<> revoke_all(sstring s) override {
-        return _authorizer->revoke_all(std::move(s));
-    }
-    future<> revoke_all(data_resource r) override {
-        return _authorizer->revoke_all(std::move(r));
-    }
-    const resource_ids& protected_resources() override {
-        return _authorizer->protected_resources();
-    }
-    future<> validate_configuration() const override {
-        return _authorizer->validate_configuration();
-    }
-};
-
-}
-
-//
-// To ensure correct initialization order, we unfortunately need to use string literals.
-//
-
-static const class_registrator<
-        auth::authenticator,
-        auth::transitional_authenticator,
-        cql3::query_processor&,
-        ::service::migration_manager&> transitional_authenticator_reg("com.scylladb.auth.TransitionalAuthenticator");
-
-static const class_registrator<
-        auth::authorizer,
-        auth::transitional_authorizer,
-        cql3::query_processor&,
-        ::service::migration_manager&> transitional_authorizer_reg("com.scylladb.auth.TransitionalAuthorizer");

bytes.hh

@@ -21,17 +21,14 @@
 
 #pragma once
 
-#include "seastarx.hh"
 #include "core/sstring.hh"
 #include "hashing.hh"
 #include <experimental/optional>
 #include <iosfwd>
 #include <functional>
-#include "utils/mutable_view.hh"
 
 using bytes = basic_sstring<int8_t, uint32_t, 31>;
 using bytes_view = std::experimental::basic_string_view<int8_t>;
-using bytes_mutable_view = basic_mutable_view<bytes_view::value_type>;
 using bytes_opt = std::experimental::optional<bytes>;
 using sstring_view = std::experimental::string_view;
 

cache_flat_mutation_reader.hh

@@ -1,650 +0,0 @@
-/*
- * Copyright (C) 2017 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 "row_cache.hh"
-#include "mutation_reader.hh"
-#include "streamed_mutation.hh"
-#include "partition_version.hh"
-#include "utils/logalloc.hh"
-#include "query-request.hh"
-#include "partition_snapshot_reader.hh"
-#include "partition_snapshot_row_cursor.hh"
-#include "read_context.hh"
-#include "flat_mutation_reader.hh"
-
-namespace cache {
-
-extern logging::logger clogger;
-
-class cache_flat_mutation_reader final : public flat_mutation_reader::impl {
-    enum class state {
-        before_static_row,
-
-        // Invariants:
-        //  - position_range(_lower_bound, _upper_bound) covers all not yet emitted positions from current range
-        //  - if _next_row has valid iterators:
-        //    - _next_row points to the nearest row in cache >= _lower_bound
-        //    - _next_row_in_range = _next.position() < _upper_bound
-        //  - if _next_row doesn't have valid iterators, it has no meaning.
-        reading_from_cache,
-
-        // Starts reading from underlying reader.
-        // The range to read is position_range(_lower_bound, min(_next_row.position(), _upper_bound)).
-        // Invariants:
-        //  - _next_row_in_range = _next.position() < _upper_bound
-        move_to_underlying,
-
-        // Invariants:
-        // - Upper bound of the read is min(_next_row.position(), _upper_bound)
-        // - _next_row_in_range = _next.position() < _upper_bound
-        // - _last_row points at a direct predecessor of the next row which is going to be read.
-        //   Used for populating continuity.
-        reading_from_underlying,
-
-        end_of_stream
-    };
-    lw_shared_ptr<partition_snapshot> _snp;
-    position_in_partition::tri_compare _position_cmp;
-
-    query::clustering_key_filter_ranges _ck_ranges;
-    query::clustering_row_ranges::const_iterator _ck_ranges_curr;
-    query::clustering_row_ranges::const_iterator _ck_ranges_end;
-
-    lsa_manager _lsa_manager;
-
-    partition_snapshot_row_weakref _last_row;
-
-    // We need to be prepared that we may get overlapping and out of order
-    // range tombstones. We must emit fragments with strictly monotonic positions,
-    // so we can't just trim such tombstones to the position of the last fragment.
-    // To solve that, range tombstones are accumulated first in a range_tombstone_stream
-    // and emitted once we have a fragment with a larger position.
-    range_tombstone_stream _tombstones;
-
-    // Holds the lower bound of a position range which hasn't been processed yet.
-    // Only fragments with positions < _lower_bound have been emitted.
-    //
-    // It is assumed that !_lower_bound.is_clustering_row(). We depend on this when
-    // calling range_tombstone::trim_front() and when inserting dummy entries. Dummy
-    // entries are assumed to be only at !is_clustering_row() positions.
-    position_in_partition _lower_bound;
-    position_in_partition_view _upper_bound;
-
-    state _state = state::before_static_row;
-    lw_shared_ptr<read_context> _read_context;
-    partition_snapshot_row_cursor _next_row;
-    bool _next_row_in_range = false;
-
-    future<> do_fill_buffer();
-    void copy_from_cache_to_buffer();
-    future<> process_static_row();
-    void move_to_end();
-    void move_to_next_range();
-    void move_to_range(query::clustering_row_ranges::const_iterator);
-    void move_to_next_entry();
-    // Emits all delayed range tombstones with positions smaller than upper_bound.
-    void drain_tombstones(position_in_partition_view upper_bound);
-    // Emits all delayed range tombstones.
-    void drain_tombstones();
-    void add_to_buffer(const partition_snapshot_row_cursor&);
-    void add_clustering_row_to_buffer(mutation_fragment&&);
-    void add_to_buffer(range_tombstone&&);
-    void add_to_buffer(mutation_fragment&&);
-    future<> read_from_underlying();
-    void start_reading_from_underlying();
-    bool after_current_range(position_in_partition_view position);
-    bool can_populate() const;
-    void maybe_update_continuity();
-    void maybe_add_to_cache(const mutation_fragment& mf);
-    void maybe_add_to_cache(const clustering_row& cr);
-    void maybe_add_to_cache(const range_tombstone& rt);
-    void maybe_add_to_cache(const static_row& sr);
-    void maybe_set_static_row_continuous();
-    void finish_reader() {
-        push_mutation_fragment(partition_end());
-        _end_of_stream = true;
-        _state = state::end_of_stream;
-    }
-public:
-    cache_flat_mutation_reader(schema_ptr s,
-                               dht::decorated_key dk,
-                               query::clustering_key_filter_ranges&& crr,
-                               lw_shared_ptr<read_context> ctx,
-                               lw_shared_ptr<partition_snapshot> snp,
-                               row_cache& cache)
-        : flat_mutation_reader::impl(std::move(s))
-        , _snp(std::move(snp))
-        , _position_cmp(*_schema)
-        , _ck_ranges(std::move(crr))
-        , _ck_ranges_curr(_ck_ranges.begin())
-        , _ck_ranges_end(_ck_ranges.end())
-        , _lsa_manager(cache)
-        , _tombstones(*_schema)
-        , _lower_bound(position_in_partition::before_all_clustered_rows())
-        , _upper_bound(position_in_partition_view::before_all_clustered_rows())
-        , _read_context(std::move(ctx))
-        , _next_row(*_schema, *_snp)
-    {
-        clogger.trace("csm {}: table={}.{}", this, _schema->ks_name(), _schema->cf_name());
-        push_mutation_fragment(partition_start(std::move(dk), _snp->partition_tombstone()));
-    }
-    cache_flat_mutation_reader(const cache_flat_mutation_reader&) = delete;
-    cache_flat_mutation_reader(cache_flat_mutation_reader&&) = delete;
-    virtual future<> fill_buffer() override;
-    virtual ~cache_flat_mutation_reader() {
-        maybe_merge_versions(_snp, _lsa_manager.region(), _lsa_manager.read_section());
-    }
-    virtual void next_partition() override {
-        clear_buffer_to_next_partition();
-        if (is_buffer_empty()) {
-            _end_of_stream = true;
-        }
-    }
-    virtual future<> fast_forward_to(const dht::partition_range&) override {
-        clear_buffer();
-        _end_of_stream = true;
-        return make_ready_future<>();
-    }
-    virtual future<> fast_forward_to(position_range pr) override {
-        throw std::bad_function_call();
-    }
-};
-
-inline
-future<> cache_flat_mutation_reader::process_static_row() {
-    if (_snp->version()->partition().static_row_continuous()) {
-        _read_context->cache().on_row_hit();
-        row sr = _lsa_manager.run_in_read_section([this] {
-            return _snp->static_row();
-        });
-        if (!sr.empty()) {
-            push_mutation_fragment(mutation_fragment(static_row(std::move(sr))));
-        }
-        return make_ready_future<>();
-    } else {
-        _read_context->cache().on_row_miss();
-        return _read_context->get_next_fragment().then([this] (mutation_fragment_opt&& sr) {
-            if (sr) {
-                assert(sr->is_static_row());
-                maybe_add_to_cache(sr->as_static_row());
-                push_mutation_fragment(std::move(*sr));
-            }
-            maybe_set_static_row_continuous();
-        });
-    }
-}
-
-inline
-future<> cache_flat_mutation_reader::fill_buffer() {
-    if (_state == state::before_static_row) {
-        auto after_static_row = [this] {
-            if (_ck_ranges_curr == _ck_ranges_end) {
-                finish_reader();
-                return make_ready_future<>();
-            }
-            _state = state::reading_from_cache;
-            _lsa_manager.run_in_read_section([this] {
-                move_to_range(_ck_ranges_curr);
-            });
-            return fill_buffer();
-        };
-        if (_schema->has_static_columns()) {
-            return process_static_row().then(std::move(after_static_row));
-        } else {
-            return after_static_row();
-        }
-    }
-    clogger.trace("csm {}: fill_buffer(), range={}, lb={}", this, *_ck_ranges_curr, _lower_bound);
-    return do_until([this] { return _end_of_stream || is_buffer_full(); }, [this] {
-        return do_fill_buffer();
-    });
-}
-
-inline
-future<> cache_flat_mutation_reader::do_fill_buffer() {
-    if (_state == state::move_to_underlying) {
-        _state = state::reading_from_underlying;
-        auto end = _next_row_in_range ? position_in_partition(_next_row.position())
-                                      : position_in_partition(_upper_bound);
-        return _read_context->fast_forward_to(position_range{_lower_bound, std::move(end)}).then([this] {
-            return read_from_underlying();
-        });
-    }
-    if (_state == state::reading_from_underlying) {
-        return read_from_underlying();
-    }
-    // assert(_state == state::reading_from_cache)
-    return _lsa_manager.run_in_read_section([this] {
-        auto next_valid = _next_row.iterators_valid();
-        clogger.trace("csm {}: reading_from_cache, range=[{}, {}), next={}, valid={}", this, _lower_bound,
-            _upper_bound, _next_row.position(), next_valid);
-        // We assume that if there was eviction, and thus the range may
-        // no longer be continuous, the cursor was invalidated.
-        if (!next_valid) {
-            auto adjacent = _next_row.advance_to(_lower_bound);
-            _next_row_in_range = !after_current_range(_next_row.position());
-            if (!adjacent && !_next_row.continuous()) {
-                _last_row = nullptr; // We could insert a dummy here, but this path is unlikely.
-                start_reading_from_underlying();
-                return make_ready_future<>();
-            }
-        }
-        _next_row.maybe_refresh();
-        clogger.trace("csm {}: next={}, cont={}", this, _next_row.position(), _next_row.continuous());
-        while (!is_buffer_full() && _state == state::reading_from_cache) {
-            copy_from_cache_to_buffer();
-            if (need_preempt()) {
-                break;
-            }
-        }
-        return make_ready_future<>();
-    });
-}
-
-inline
-future<> cache_flat_mutation_reader::read_from_underlying() {
-    return consume_mutation_fragments_until(_read_context->underlying().underlying(),
-        [this] { return _state != state::reading_from_underlying || is_buffer_full(); },
-        [this] (mutation_fragment mf) {
-            _read_context->cache().on_row_miss();
-            maybe_add_to_cache(mf);
-            add_to_buffer(std::move(mf));
-        },
-        [this] {
-            _state = state::reading_from_cache;
-            _lsa_manager.run_in_update_section([this] {
-                auto same_pos = _next_row.maybe_refresh();
-                if (!same_pos) {
-                    _read_context->cache().on_mispopulate(); // FIXME: Insert dummy entry at _upper_bound.
-                    _next_row_in_range = !after_current_range(_next_row.position());
-                    if (!_next_row.continuous()) {
-                        start_reading_from_underlying();
-                    }
-                    return;
-                }
-                if (_next_row_in_range) {
-                    maybe_update_continuity();
-                    _last_row = _next_row;
-                    add_to_buffer(_next_row);
-                    try {
-                        move_to_next_entry();
-                    } catch (const std::bad_alloc&) {
-                        // We cannot reenter the section, since we may have moved to the new range, and
-                        // because add_to_buffer() should not be repeated.
-                        _snp->region().allocator().invalidate_references(); // Invalidates _next_row
-                    }
-                } else {
-                    if (no_clustering_row_between(*_schema, _upper_bound, _next_row.position())) {
-                        this->maybe_update_continuity();
-                    } else if (can_populate()) {
-                        rows_entry::compare less(*_schema);
-                        auto& rows = _snp->version()->partition().clustered_rows();
-                        if (query::is_single_row(*_schema, *_ck_ranges_curr)) {
-                            with_allocator(_snp->region().allocator(), [&] {
-                                auto e = alloc_strategy_unique_ptr<rows_entry>(
-                                    current_allocator().construct<rows_entry>(_ck_ranges_curr->start()->value()));
-                                // Use _next_row iterator only as a hint, because there could be insertions after _upper_bound.
-                                auto insert_result = rows.insert_check(_next_row.get_iterator_in_latest_version(), *e, less);
-                                auto inserted = insert_result.second;
-                                auto it = insert_result.first;
-                                if (inserted) {
-                                    e.release();
-                                    auto next = std::next(it);
-                                    it->set_continuous(next->continuous());
-                                    clogger.trace("csm {}: inserted dummy at {}, cont={}", this, it->position(), it->continuous());
-                                }
-                            });
-                        } else if (!_ck_ranges_curr->start() || _last_row.refresh(*_snp)) {
-                            with_allocator(_snp->region().allocator(), [&] {
-                                auto e = alloc_strategy_unique_ptr<rows_entry>(
-                                    current_allocator().construct<rows_entry>(*_schema, _upper_bound, is_dummy::yes, is_continuous::yes));
-                                // Use _next_row iterator only as a hint, because there could be insertions after _upper_bound.
-                                auto insert_result = rows.insert_check(_next_row.get_iterator_in_latest_version(), *e, less);
-                                auto inserted = insert_result.second;
-                                if (inserted) {
-                                    clogger.trace("csm {}: inserted dummy at {}", this, _upper_bound);
-                                    e.release();
-                                } else {
-                                    clogger.trace("csm {}: mark {} as continuous", this, insert_result.first->position());
-                                    insert_result.first->set_continuous(true);
-                                }
-                            });
-                        }
-                    } else {
-                        _read_context->cache().on_mispopulate();
-                    }
-                    try {
-                        move_to_next_range();
-                    } catch (const std::bad_alloc&) {
-                        // We cannot reenter the section, since we may have moved to the new range
-                        _snp->region().allocator().invalidate_references(); // Invalidates _next_row
-                    }
-                }
-            });
-            return make_ready_future<>();
-        });
-}
-
-inline
-void cache_flat_mutation_reader::maybe_update_continuity() {
-    if (can_populate() && (!_ck_ranges_curr->start() || _last_row.refresh(*_snp))) {
-            if (_next_row.is_in_latest_version()) {
-                clogger.trace("csm {}: mark {} continuous", this, _next_row.get_iterator_in_latest_version()->position());
-                _next_row.get_iterator_in_latest_version()->set_continuous(true);
-            } else {
-                // Cover entry from older version
-                with_allocator(_snp->region().allocator(), [&] {
-                    auto& rows = _snp->version()->partition().clustered_rows();
-                    rows_entry::compare less(*_schema);
-                    auto e = alloc_strategy_unique_ptr<rows_entry>(
-                        current_allocator().construct<rows_entry>(*_schema, _next_row.position(), is_dummy(_next_row.dummy()), is_continuous::yes));
-                    auto insert_result = rows.insert_check(_next_row.get_iterator_in_latest_version(), *e, less);
-                    auto inserted = insert_result.second;
-                    if (inserted) {
-                        clogger.trace("csm {}: inserted dummy at {}", this, e->position());
-                        e.release();
-                    }
-                });
-            }
-    } else {
-        _read_context->cache().on_mispopulate();
-    }
-}
-
-inline
-void cache_flat_mutation_reader::maybe_add_to_cache(const mutation_fragment& mf) {
-    if (mf.is_range_tombstone()) {
-        maybe_add_to_cache(mf.as_range_tombstone());
-    } else {
-        assert(mf.is_clustering_row());
-        const clustering_row& cr = mf.as_clustering_row();
-        maybe_add_to_cache(cr);
-    }
-}
-
-inline
-void cache_flat_mutation_reader::maybe_add_to_cache(const clustering_row& cr) {
-    if (!can_populate()) {
-        _last_row = nullptr;
-        _read_context->cache().on_mispopulate();
-        return;
-    }
-    clogger.trace("csm {}: populate({})", this, cr);
-    _lsa_manager.run_in_update_section_with_allocator([this, &cr] {
-        mutation_partition& mp = _snp->version()->partition();
-        rows_entry::compare less(*_schema);
-
-        auto new_entry = alloc_strategy_unique_ptr<rows_entry>(
-            current_allocator().construct<rows_entry>(cr.key(), cr.tomb(), cr.marker(), cr.cells()));
-        new_entry->set_continuous(false);
-        auto it = _next_row.iterators_valid() ? _next_row.get_iterator_in_latest_version()
-                                              : mp.clustered_rows().lower_bound(cr.key(), less);
-        auto insert_result = mp.clustered_rows().insert_check(it, *new_entry, less);
-        if (insert_result.second) {
-            _read_context->cache().on_row_insert();
-            new_entry.release();
-        }
-        it = insert_result.first;
-
-        rows_entry& e = *it;
-        if (!_ck_ranges_curr->start() || _last_row.refresh(*_snp)) {
-            clogger.trace("csm {}: set_continuous({})", this, e.position());
-            e.set_continuous(true);
-        } else {
-            _read_context->cache().on_mispopulate();
-        }
-        with_allocator(standard_allocator(), [&] {
-            _last_row = partition_snapshot_row_weakref(*_snp, it);
-        });
-    });
-}
-
-inline
-bool cache_flat_mutation_reader::after_current_range(position_in_partition_view p) {
-    return _position_cmp(p, _upper_bound) >= 0;
-}
-
-inline
-void cache_flat_mutation_reader::start_reading_from_underlying() {
-    clogger.trace("csm {}: start_reading_from_underlying(), range=[{}, {})", this, _lower_bound, _next_row_in_range ? _next_row.position() : _upper_bound);
-    _state = state::move_to_underlying;
-}
-
-inline
-void cache_flat_mutation_reader::copy_from_cache_to_buffer() {
-    clogger.trace("csm {}: copy_from_cache, next={}, next_row_in_range={}", this, _next_row.position(), _next_row_in_range);
-    position_in_partition_view next_lower_bound = _next_row.dummy() ? _next_row.position() : position_in_partition_view::after_key(_next_row.key());
-    for (auto&& rts : _snp->range_tombstones(*_schema, _lower_bound, _next_row_in_range ? next_lower_bound : _upper_bound)) {
-        add_to_buffer(std::move(rts));
-        if (is_buffer_full()) {
-            return;
-        }
-    }
-    if (_next_row_in_range) {
-        _last_row = _next_row;
-        add_to_buffer(_next_row);
-        move_to_next_entry();
-    } else {
-        move_to_next_range();
-    }
-}
-
-inline
-void cache_flat_mutation_reader::move_to_end() {
-    drain_tombstones();
-    finish_reader();
-    clogger.trace("csm {}: eos", this);
-}
-
-inline
-void cache_flat_mutation_reader::move_to_next_range() {
-    auto next_it = std::next(_ck_ranges_curr);
-    if (next_it == _ck_ranges_end) {
-        move_to_end();
-        _ck_ranges_curr = next_it;
-    } else {
-        move_to_range(next_it);
-    }
-}
-
-inline
-void cache_flat_mutation_reader::move_to_range(query::clustering_row_ranges::const_iterator next_it) {
-    auto lb = position_in_partition::for_range_start(*next_it);
-    auto ub = position_in_partition_view::for_range_end(*next_it);
-    _last_row = nullptr;
-    _lower_bound = std::move(lb);
-    _upper_bound = std::move(ub);
-    _ck_ranges_curr = next_it;
-    auto adjacent = _next_row.advance_to(_lower_bound);
-    _next_row_in_range = !after_current_range(_next_row.position());
-    clogger.trace("csm {}: move_to_range(), range={}, lb={}, ub={}, next={}", this, *_ck_ranges_curr, _lower_bound, _upper_bound, _next_row.position());
-    if (!adjacent && !_next_row.continuous()) {
-        // FIXME: We don't insert a dummy for singular range to avoid allocating 3 entries
-        // for a hit (before, at and after). If we supported the concept of an incomplete row,
-        // we could insert such a row for the lower bound if it's full instead, for both singular and
-        // non-singular ranges.
-        if (_ck_ranges_curr->start() && !query::is_single_row(*_schema, *_ck_ranges_curr)) {
-            // Insert dummy for lower bound
-            if (can_populate()) {
-                // FIXME: _lower_bound could be adjacent to the previous row, in which case we could skip this
-                clogger.trace("csm {}: insert dummy at {}", this, _lower_bound);
-                auto it = with_allocator(_lsa_manager.region().allocator(), [&] {
-                    auto& rows = _snp->version()->partition().clustered_rows();
-                    auto new_entry = current_allocator().construct<rows_entry>(*_schema, _lower_bound, is_dummy::yes, is_continuous::no);
-                    return rows.insert_before(_next_row.get_iterator_in_latest_version(), *new_entry);
-                });
-                _last_row = partition_snapshot_row_weakref(*_snp, it);
-            } else {
-                _read_context->cache().on_mispopulate();
-            }
-        }
-        start_reading_from_underlying();
-    }
-}
-
-// _next_row must be inside the range.
-inline
-void cache_flat_mutation_reader::move_to_next_entry() {
-    clogger.trace("csm {}: move_to_next_entry(), curr={}", this, _next_row.position());
-    if (no_clustering_row_between(*_schema, _next_row.position(), _upper_bound)) {
-        move_to_next_range();
-    } else {
-        if (!_next_row.next()) {
-            move_to_end();
-            return;
-        }
-        _next_row_in_range = !after_current_range(_next_row.position());
-        clogger.trace("csm {}: next={}, cont={}, in_range={}", this, _next_row.position(), _next_row.continuous(), _next_row_in_range);
-        if (!_next_row.continuous()) {
-            start_reading_from_underlying();
-        }
-    }
-}
-
-inline
-void cache_flat_mutation_reader::drain_tombstones(position_in_partition_view pos) {
-    while (true) {
-        reserve_one();
-        auto mfo = _tombstones.get_next(pos);
-        if (!mfo) {
-            break;
-        }
-        push_mutation_fragment(std::move(*mfo));
-    }
-}
-
-inline
-void cache_flat_mutation_reader::drain_tombstones() {
-    while (true) {
-        reserve_one();
-        auto mfo = _tombstones.get_next();
-        if (!mfo) {
-            break;
-        }
-        push_mutation_fragment(std::move(*mfo));
-    }
-}
-
-inline
-void cache_flat_mutation_reader::add_to_buffer(mutation_fragment&& mf) {
-    clogger.trace("csm {}: add_to_buffer({})", this, mf);
-    if (mf.is_clustering_row()) {
-        add_clustering_row_to_buffer(std::move(mf));
-    } else {
-        assert(mf.is_range_tombstone());
-        add_to_buffer(std::move(mf).as_range_tombstone());
-    }
-}
-
-inline
-void cache_flat_mutation_reader::add_to_buffer(const partition_snapshot_row_cursor& row) {
-    if (!row.dummy()) {
-        _read_context->cache().on_row_hit();
-        add_clustering_row_to_buffer(row.row());
-    }
-}
-
-// Maintains the following invariants, also in case of exception:
-//   (1) no fragment with position >= _lower_bound was pushed yet
-//   (2) If _lower_bound > mf.position(), mf was emitted
-inline
-void cache_flat_mutation_reader::add_clustering_row_to_buffer(mutation_fragment&& mf) {
-    clogger.trace("csm {}: add_clustering_row_to_buffer({})", this, mf);
-    auto& row = mf.as_clustering_row();
-    auto key = row.key();
-    try {
-        drain_tombstones(row.position());
-        push_mutation_fragment(std::move(mf));
-        _lower_bound = position_in_partition::after_key(std::move(key));
-    } catch (...) {
-        // We may have emitted some of the range tombstones which start after the old _lower_bound
-        _lower_bound = position_in_partition::for_key(std::move(key));
-        throw;
-    }
-}
-
-inline
-void cache_flat_mutation_reader::add_to_buffer(range_tombstone&& rt) {
-    clogger.trace("csm {}: add_to_buffer({})", this, rt);
-    // This guarantees that rt starts after any emitted clustering_row
-    if (!rt.trim_front(*_schema, _lower_bound)) {
-        return;
-    }
-    _lower_bound = position_in_partition(rt.position());
-    _tombstones.apply(std::move(rt));
-    drain_tombstones(_lower_bound);
-}
-
-inline
-void cache_flat_mutation_reader::maybe_add_to_cache(const range_tombstone& rt) {
-    if (can_populate()) {
-        clogger.trace("csm {}: maybe_add_to_cache({})", this, rt);
-        _lsa_manager.run_in_update_section_with_allocator([&] {
-            _snp->version()->partition().row_tombstones().apply_monotonically(*_schema, rt);
-        });
-    } else {
-        _read_context->cache().on_mispopulate();
-    }
-}
-
-inline
-void cache_flat_mutation_reader::maybe_add_to_cache(const static_row& sr) {
-    if (can_populate()) {
-        clogger.trace("csm {}: populate({})", this, sr);
-        _read_context->cache().on_row_insert();
-        _lsa_manager.run_in_update_section_with_allocator([&] {
-            _snp->version()->partition().static_row().apply(*_schema, column_kind::static_column, sr.cells());
-        });
-    } else {
-        _read_context->cache().on_mispopulate();
-    }
-}
-
-inline
-void cache_flat_mutation_reader::maybe_set_static_row_continuous() {
-    if (can_populate()) {
-        clogger.trace("csm {}: set static row continuous", this);
-        _snp->version()->partition().set_static_row_continuous(true);
-    } else {
-        _read_context->cache().on_mispopulate();
-    }
-}
-
-inline
-bool cache_flat_mutation_reader::can_populate() const {
-    return _snp->at_latest_version() && _read_context->cache().phase_of(_read_context->key()) == _read_context->phase();
-}
-
-} // namespace cache
-
-inline flat_mutation_reader make_cache_flat_mutation_reader(schema_ptr s,
-                                                            dht::decorated_key dk,
-                                                            query::clustering_key_filter_ranges crr,
-                                                            row_cache& cache,
-                                                            lw_shared_ptr<cache::read_context> ctx,
-                                                            lw_shared_ptr<partition_snapshot> snp)
-{
-    return make_flat_mutation_reader<cache::cache_flat_mutation_reader>(
-        std::move(s), std::move(dk), std::move(crr), std::move(ctx), std::move(snp), cache);
-}

caching_options.hh

@@ -24,7 +24,6 @@
 #include <boost/lexical_cast.hpp>
 #include "exceptions/exceptions.hh"
 #include "json.hh"
-#include "seastarx.hh"
 
 class schema;
 
@@ -59,34 +58,30 @@ class caching_options {
     caching_options() : _key_cache(default_key), _row_cache(default_row) {}
 public:
 
-    std::map<sstring, sstring> to_map() const {
-        return {{ "keys", _key_cache }, { "rows_per_partition", _row_cache }};
-    }
-
     sstring to_sstring() const {
-        return json::to_json(to_map());
+        return json::to_json(std::map<sstring, sstring>({{ "keys", _key_cache }, { "rows_per_partition", _row_cache }}));
     }
 
-    template<typename Map>
-    static caching_options from_map(const Map & map) {
-        sstring k = default_key;
-        sstring r = default_row;
+    static caching_options from_sstring(const sstring& str) {
+        auto map = json::to_map(str);
+        if (map.size() > 2) {
+            throw exceptions::configuration_exception("Invalid map: " + str); 
+        }
+        sstring k;
+        sstring r;
+        if (map.count("keys")) {
+            k = map.at("keys");
+        } else {
+            k = default_key;
+        }
 
-        for (auto& p : map) {
-            if (p.first == "keys") {
-                k = p.second;
-            } else if (p.first == "rows_per_partition") {
-                r = p.second;
-            } else {
-                throw exceptions::configuration_exception("Invalid caching option: " + p.first);
-            }
+        if (map.count("rows_per_partition")) {
+            r = map.at("rows_per_partition");
+        } else {
+            r = default_row;
         }
         return caching_options(k, r);
     }
-    static caching_options from_sstring(const sstring& str) {
-        return from_map(json::to_map(str));
-    }
-
     bool operator==(const caching_options& other) const {
         return _key_cache == other._key_cache && _row_cache == other._row_cache;
     }

cell_locking.hh

@@ -136,17 +136,7 @@ public:
 
 class locked_cell;
 
-struct cell_locker_stats {
-    uint64_t lock_acquisitions = 0;
-    uint64_t operations_waiting_for_lock = 0;
-};
-
 class cell_locker {
-public:
-    using timeout_clock = lowres_clock;
-private:
-    using semaphore_type = basic_semaphore<default_timeout_exception_factory, timeout_clock>;
-
     class partition_entry;
 
     struct cell_address {
@@ -158,7 +148,7 @@ private:
                        public enable_lw_shared_from_this<cell_entry> {
         partition_entry& _parent;
         cell_address _address;
-        semaphore_type _semaphore { 0 };
+        semaphore _semaphore { 0 };
 
         friend class cell_locker;
     public:
@@ -187,8 +177,8 @@ private:
             return _address.position;
         }
 
-        future<> lock(timeout_clock::time_point _timeout) {
-            return _semaphore.wait(_timeout);
+        future<> lock() {
+            return _semaphore.wait();
         }
         void unlock() {
             _semaphore.signal();
@@ -246,14 +236,14 @@ private:
                                              bi::hash<cell_entry::hasher>,
                                              bi::constant_time_size<false>>;
 
-        static constexpr size_t initial_bucket_count = 16;
+        static constexpr size_t initial_bucket_count = 64;
         using max_load_factor = std::ratio<3, 4>;
+
         dht::decorated_key _key;
         cell_locker& _parent;
         size_t _rehash_at_size = compute_rehash_at_size(initial_bucket_count);
         std::unique_ptr<cells_type::bucket_type[]> _buckets; // TODO: start with internal storage?
         size_t _cell_count = 0; // cells_type::empty() is not O(1) if the hook is auto-unlink
-        cells_type::bucket_type _internal_buckets[initial_bucket_count];
         cells_type _cells;
         schema_ptr _schema;
 
@@ -277,7 +267,8 @@ private:
         partition_entry(schema_ptr s, cell_locker& parent, const dht::decorated_key& dk)
             : _key(dk)
             , _parent(parent)
-            , _cells(cells_type::bucket_traits(_internal_buckets, initial_bucket_count),
+            , _buckets(std::make_unique<cells_type::bucket_type[]>(initial_bucket_count))
+            , _cells(cells_type::bucket_traits(_buckets.get(), initial_bucket_count),
                      cell_entry::hasher(*s), cell_entry::equal_compare(*s))
             , _schema(s)
         { }
@@ -344,7 +335,6 @@ private:
     // partitions_type uses equality comparator which keeps a reference to the
     // original schema, we must ensure that it doesn't die.
     schema_ptr _original_schema;
-    cell_locker_stats& _stats;
 
     friend class locked_cell;
 private:
@@ -365,13 +355,12 @@ private:
         }
     }
 public:
-    explicit cell_locker(schema_ptr s, cell_locker_stats& stats)
+    explicit cell_locker(schema_ptr s)
         : _buckets(std::make_unique<partitions_type::bucket_type[]>(initial_bucket_count))
         , _partitions(partitions_type::bucket_traits(_buckets.get(), initial_bucket_count),
                       partition_entry::hasher(), partition_entry::equal_compare(*s))
         , _schema(s)
         , _original_schema(std::move(s))
-        , _stats(stats)
     { }
 
     ~cell_locker() {
@@ -386,8 +375,7 @@ public:
     }
 
     // partition_cells_range is required to be in cell_locker::schema()
-    future<std::vector<locked_cell>> lock_cells(const dht::decorated_key& dk, partition_cells_range&& range,
-                                                timeout_clock::time_point timeout);
+    future<std::vector<locked_cell>> lock_cells(const dht::decorated_key& dk, partition_cells_range&& range);
 };
 
 
@@ -416,9 +404,7 @@ struct cell_locker::locker {
     partition_cells_range::iterator _current_ck;
     cells_range::const_iterator _current_cell;
 
-    timeout_clock::time_point _timeout;
     std::vector<locked_cell> _locks;
-    cell_locker_stats& _stats;
 private:
     void update_ck() {
         if (!is_done()) {
@@ -430,14 +416,12 @@ private:
 
     bool is_done() const { return _current_ck == _range.end(); }
 public:
-    explicit locker(const ::schema& s, cell_locker_stats& st, partition_entry& pe, partition_cells_range&& range, timeout_clock::time_point timeout)
+    explicit locker(const ::schema& s, partition_entry& pe, partition_cells_range&& range)
         : _hasher(s)
         , _eq_cmp(s)
         , _partition_entry(pe)
         , _range(std::move(range))
         , _current_ck(_range.begin())
-        , _timeout(timeout)
-        , _stats(st)
     {
         update_ck();
     }
@@ -458,7 +442,7 @@ public:
 };
 
 inline
-future<std::vector<locked_cell>> cell_locker::lock_cells(const dht::decorated_key& dk, partition_cells_range&& range, timeout_clock::time_point timeout) {
+future<std::vector<locked_cell>> cell_locker::lock_cells(const dht::decorated_key& dk, partition_cells_range&& range) {
     partition_entry::hasher pe_hash;
     partition_entry::equal_compare pe_eq(*_schema);
 
@@ -480,7 +464,6 @@ future<std::vector<locked_cell>> cell_locker::lock_cells(const dht::decorated_ke
             }
             for (auto&& c : r) {
                 auto cell = make_lw_shared<cell_entry>(*partition, position_in_partition(r.position()), c);
-                _stats.lock_acquisitions++;
                 partition->insert(cell);
                 locks.emplace_back(std::move(cell));
             }
@@ -494,7 +477,7 @@ future<std::vector<locked_cell>> cell_locker::lock_cells(const dht::decorated_ke
         return make_ready_future<std::vector<locked_cell>>(std::move(locks));
     }
 
-    auto l = std::make_unique<locker>(*_schema, _stats, *it, std::move(range), timeout);
+    auto l = std::make_unique<locker>(*_schema, *it, std::move(range));
     auto f = l->lock_all();
     return f.then([l = std::move(l)] {
         return std::move(*l).get();
@@ -515,16 +498,12 @@ future<> cell_locker::locker::lock_next() {
         cell_address ca { position_in_partition(_current_ck->position()), cid };
         auto it = _partition_entry.cells().find(ca, _hasher, _eq_cmp);
         if (it != _partition_entry.cells().end()) {
-            _stats.operations_waiting_for_lock++;
-            return it->lock(_timeout).then([this, ce = it->shared_from_this()] () mutable {
-                _stats.operations_waiting_for_lock--;
-                _stats.lock_acquisitions++;
+            return it->lock().then([this, ce = it->shared_from_this()] () mutable {
                 _locks.emplace_back(std::move(ce));
             });
         }
 
         auto cell = make_lw_shared<cell_entry>(_partition_entry, position_in_partition(_current_ck->position()), cid);
-        _stats.lock_acquisitions++;
         _partition_entry.insert(cell);
         _locks.emplace_back(std::move(cell));
     }

checked-file-impl.hh

@@ -112,11 +112,6 @@ public:
         });
     }
 
-    virtual future<temporary_buffer<uint8_t>> dma_read_bulk(uint64_t offset, size_t range_size, const io_priority_class& pc) override {
-        return do_io_check(_error_handler, [&] {
-            return get_file_impl(_file)->dma_read_bulk(offset, range_size, pc);
-        });
-    }
 private:
     const io_error_handler& _error_handler;
     file _file;
@@ -130,7 +125,7 @@ inline file make_checked_file(const io_error_handler& error_handler, file f)
 future<file>
 inline open_checked_file_dma(const io_error_handler& error_handler,
                              sstring name, open_flags flags,
-                             file_open_options options = {})
+                             file_open_options options)
 {
     return do_io_check(error_handler, [&] {
         return open_file_dma(name, flags, options).then([&] (file f) {
@@ -139,6 +134,17 @@ inline open_checked_file_dma(const io_error_handler& error_handler,
     });
 }
 
+future<file>
+inline open_checked_file_dma(const io_error_handler& error_handler,
+                             sstring name, open_flags flags)
+{
+    return do_io_check(error_handler, [&] {
+        return open_file_dma(name, flags).then([&] (file f) {
+            return make_ready_future<file>(make_checked_file(error_handler, f));
+        });
+    });
+}
+
 future<file>
 inline open_checked_directory(const io_error_handler& error_handler,
                               sstring name)

clocks-impl.hh

@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2017 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 <algorithm>
-#include <atomic>
-#include <chrono>
-#include <cstdint>
-
-extern std::atomic<int64_t> clocks_offset;
-
-template<typename Duration>
-static inline void forward_jump_clocks(Duration delta)
-{
-    auto d = std::chrono::duration_cast<std::chrono::seconds>(delta).count();
-    clocks_offset.fetch_add(d, std::memory_order_relaxed);
-}
-
-static inline std::chrono::seconds get_clocks_offset()
-{
-    auto off = clocks_offset.load(std::memory_order_relaxed);
-    return std::chrono::seconds(off);
-}
-
-// Returns a time point which is earlier from t by d, or minimum time point if it cannot be represented.
-template<typename Clock, typename Duration, typename Rep, typename Period>
-inline
-auto saturating_subtract(std::chrono::time_point<Clock, Duration> t, std::chrono::duration<Rep, Period> d) -> decltype(t) {
-    return std::max(t, decltype(t)::min() + d) - d;
-}

clustering_bounds_comparator.hh

@@ -42,9 +42,20 @@ std::ostream& operator<<(std::ostream& out, const bound_kind k);
 bound_kind invert_kind(bound_kind k);
 int32_t weight(bound_kind k);
 
+static inline bound_kind flip_bound_kind(bound_kind bk)
+{
+    switch (bk) {
+    case bound_kind::excl_end: return bound_kind::excl_start;
+    case bound_kind::incl_end: return bound_kind::incl_start;
+    case bound_kind::excl_start: return bound_kind::excl_end;
+    case bound_kind::incl_start: return bound_kind::incl_end;
+    }
+    abort();
+}
+
 class bound_view {
-public:
     const static thread_local clustering_key empty_prefix;
+public:
     const clustering_key_prefix& prefix;
     bound_kind kind;
     bound_view(const clustering_key_prefix& prefix, bound_kind kind)
@@ -122,33 +133,20 @@ public:
     static bound_view top() {
         return {empty_prefix, bound_kind::incl_end};
     }
-    template<template<typename> typename R>
-    GCC6_CONCEPT( requires Range<R, clustering_key_prefix_view> )
-    static bound_view from_range_start(const R<clustering_key_prefix>& range) {
-        return range.start()
-               ? bound_view(range.start()->value(), range.start()->is_inclusive() ? bound_kind::incl_start : bound_kind::excl_start)
-               : bottom();
-    }
-    template<template<typename> typename R>
-    GCC6_CONCEPT( requires Range<R, clustering_key_prefix> )
-    static bound_view from_range_end(const R<clustering_key_prefix>& range) {
-        return range.end()
-               ? bound_view(range.end()->value(), range.end()->is_inclusive() ? bound_kind::incl_end : bound_kind::excl_end)
-               : top();
-    }
-    template<template<typename> typename R>
-    GCC6_CONCEPT( requires Range<R, clustering_key_prefix> )
-    static std::pair<bound_view, bound_view> from_range(const R<clustering_key_prefix>& range) {
-        return {from_range_start(range), from_range_end(range)};
-    }
-    template<template<typename> typename R>
-    GCC6_CONCEPT( requires Range<R, clustering_key_prefix_view> )
-    static stdx::optional<typename R<clustering_key_prefix_view>::bound> to_range_bound(const bound_view& bv) {
-        if (&bv.prefix == &empty_prefix) {
-            return {};
-        }
-        bool inclusive = bv.kind != bound_kind::excl_end && bv.kind != bound_kind::excl_start;
-        return {typename R<clustering_key_prefix_view>::bound(bv.prefix.view(), inclusive)};
+    /*
+    template<template<typename> typename T, typename U>
+    concept bool Range() {
+        return requires (T<U> range) {
+            { range.start() } -> stdx::optional<U>;
+            { range.end() } -> stdx::optional<U>;
+        };
+    };*/
+    template<template<typename> typename Range>
+    static std::pair<bound_view, bound_view> from_range(const Range<clustering_key_prefix>& range) {
+        return {
+            range.start() ? bound_view(range.start()->value(), range.start()->is_inclusive() ? bound_kind::incl_start : bound_kind::excl_start) : bottom(),
+            range.end() ? bound_view(range.end()->value(), range.end()->is_inclusive() ? bound_kind::incl_end : bound_kind::excl_end) : top(),
+        };
     }
     friend std::ostream& operator<<(std::ostream& out, const bound_view& b) {
         return out << "{bound: prefix=" << b.prefix << ", kind=" << b.kind << "}";

clustering_key_filter.hh

@@ -54,7 +54,6 @@ public:
     auto end() const { return _ref.end(); }
     bool empty() const { return _ref.empty(); }
     size_t size() const { return _ref.size(); }
-    const clustering_row_ranges& ranges() const { return _ref; }
 
     static clustering_key_filter_ranges get_ranges(const schema& schema, const query::partition_slice& slice, const partition_key& key) {
         const query::clustering_row_ranges& ranges = slice.row_ranges(schema, key);

clustering_ranges_walker.hh

@@ -1,219 +0,0 @@
-/*
- * Copyright (C) 2017 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 "schema.hh"
-#include "query-request.hh"
-#include "streamed_mutation.hh"
-
-// Utility for in-order checking of overlap with position ranges.
-class clustering_ranges_walker {
-    const schema& _schema;
-    const query::clustering_row_ranges& _ranges;
-    query::clustering_row_ranges::const_iterator _current;
-    query::clustering_row_ranges::const_iterator _end;
-    bool _in_current; // next position is known to be >= _current_start
-    bool _with_static_row;
-    position_in_partition_view _current_start;
-    position_in_partition_view _current_end;
-    stdx::optional<position_in_partition> _trim;
-    size_t _change_counter = 1;
-private:
-    bool advance_to_next_range() {
-        _in_current = false;
-        if (!_current_start.is_static_row()) {
-            if (_current == _end) {
-                return false;
-            }
-            ++_current;
-        }
-        ++_change_counter;
-        if (_current == _end) {
-            _current_end = _current_start = position_in_partition_view::after_all_clustered_rows();
-            return false;
-        }
-        _current_start = position_in_partition_view::for_range_start(*_current);
-        _current_end = position_in_partition_view::for_range_end(*_current);
-        return true;
-    }
-public:
-    clustering_ranges_walker(const schema& s, const query::clustering_row_ranges& ranges, bool with_static_row = true)
-        : _schema(s)
-        , _ranges(ranges)
-        , _current(ranges.begin())
-        , _end(ranges.end())
-        , _in_current(with_static_row)
-        , _with_static_row(with_static_row)
-        , _current_start(position_in_partition_view::for_static_row())
-        , _current_end(position_in_partition_view::before_all_clustered_rows())
-    {
-        if (!with_static_row) {
-            if (_current == _end) {
-                _current_start = position_in_partition_view::before_all_clustered_rows();
-            } else {
-                _current_start = position_in_partition_view::for_range_start(*_current);
-                _current_end = position_in_partition_view::for_range_end(*_current);
-            }
-        }
-    }
-    clustering_ranges_walker(clustering_ranges_walker&& o) noexcept
-        : _schema(o._schema)
-        , _ranges(o._ranges)
-        , _current(o._current)
-        , _end(o._end)
-        , _in_current(o._in_current)
-        , _with_static_row(o._with_static_row)
-        , _current_start(o._current_start)
-        , _current_end(o._current_end)
-        , _trim(std::move(o._trim))
-        , _change_counter(o._change_counter)
-    { }
-    clustering_ranges_walker& operator=(clustering_ranges_walker&& o) {
-        if (this != &o) {
-            this->~clustering_ranges_walker();
-            new (this) clustering_ranges_walker(std::move(o));
-        }
-        return *this;
-    }
-
-    // Excludes positions smaller than pos from the ranges.
-    // pos should be monotonic.
-    // No constraints between pos and positions passed to advance_to().
-    //
-    // After the invocation, when !out_of_range(), lower_bound() returns the smallest position still contained.
-    void trim_front(position_in_partition pos) {
-        position_in_partition::less_compare less(_schema);
-
-        do {
-            if (!less(_current_start, pos)) {
-                break;
-            }
-            if (less(pos, _current_end)) {
-                _trim = std::move(pos);
-                _current_start = *_trim;
-                _in_current = false;
-                ++_change_counter;
-                break;
-            }
-        } while (advance_to_next_range());
-    }
-
-    // Returns true if given position is contained.
-    // Must be called with monotonic positions.
-    // Idempotent.
-    bool advance_to(position_in_partition_view pos) {
-        position_in_partition::less_compare less(_schema);
-
-        do {
-            if (!_in_current && less(pos, _current_start)) {
-                break;
-            }
-            // All subsequent clustering keys are larger than the start of this
-            // range so there is no need to check that again.
-            _in_current = true;
-
-            if (less(pos, _current_end)) {
-                return true;
-            }
-        } while (advance_to_next_range());
-
-        return false;
-    }
-
-    // Returns true if the range expressed by start and end (as in position_range) overlaps
-    // with clustering ranges.
-    // Must be called with monotonic start position. That position must also be greater than
-    // the last position passed to the other advance_to() overload.
-    // Idempotent.
-    bool advance_to(position_in_partition_view start, position_in_partition_view end) {
-        position_in_partition::less_compare less(_schema);
-
-        do {
-            if (!less(_current_start, end)) {
-                break;
-            }
-            if (less(start, _current_end)) {
-                return true;
-            }
-        } while (advance_to_next_range());
-
-        return false;
-    }
-
-    // Returns true if the range tombstone expressed by start and end (as in position_range) overlaps
-    // with clustering ranges.
-    // No monotonicity restrictions on argument values across calls.
-    // Does not affect lower_bound().
-    // Idempotent.
-    bool contains_tombstone(position_in_partition_view start, position_in_partition_view end) const {
-        position_in_partition::less_compare less(_schema);
-
-        if (_trim && !less(*_trim, end)) {
-            return false;
-        }
-
-        auto i = _current;
-        while (i != _end) {
-            auto range_start = position_in_partition_view::for_range_start(*i);
-            if (!less(range_start, end)) {
-                return false;
-            }
-            auto range_end = position_in_partition_view::for_range_end(*i);
-            if (less(start, range_end)) {
-                return true;
-            }
-            ++i;
-        }
-
-        return false;
-    }
-
-    // Returns true if advanced past all contained positions. Any later advance_to() until reset() will return false.
-    bool out_of_range() const {
-        return !_in_current && _current == _end;
-    }
-
-    // Resets the state of the walker so that advance_to() can be now called for new sequence of positions.
-    // Any range trimmings still hold after this.
-    void reset() {
-        auto trim = std::move(_trim);
-        auto ctr = _change_counter;
-        *this = clustering_ranges_walker(_schema, _ranges, _with_static_row);
-        _change_counter = ctr + 1;
-        if (trim) {
-            trim_front(std::move(*trim));
-        }
-    }
-
-    // Can be called only when !out_of_range()
-    position_in_partition_view lower_bound() const {
-        return _current_start;
-    }
-
-    // When lower_bound() changes, this also does
-    // Always > 0.
-    size_t lower_bound_change_counter() const {
-        return _change_counter;
-    }
-};

coding-style.md

@@ -1,3 +0,0 @@
-# Scylla Coding Style
-
-Please see the [Seastar style document](https://github.com/scylladb/seastar/blob/master/coding-style.md).

compaction_strategy.hh

@@ -21,9 +21,6 @@
 
 #pragma once
 
-#include "sstables/shared_sstable.hh"
-#include "exceptions/exceptions.hh"
-
 class column_family;
 class schema;
 using schema_ptr = lw_shared_ptr<const schema>;
@@ -36,14 +33,12 @@ enum class compaction_strategy_type {
     size_tiered,
     leveled,
     date_tiered,
-    time_window,
 };
 
 class compaction_strategy_impl;
 class sstable;
 class sstable_set;
 struct compaction_descriptor;
-struct resharding_descriptor;
 
 class compaction_strategy {
     ::shared_ptr<compaction_strategy_impl> _compaction_strategy_impl;
@@ -57,13 +52,11 @@ public:
     compaction_strategy& operator=(compaction_strategy&&);
 
     // Return a list of sstables to be compacted after applying the strategy.
-    compaction_descriptor get_sstables_for_compaction(column_family& cfs, std::vector<shared_sstable> candidates);
-
-    std::vector<resharding_descriptor> get_resharding_jobs(column_family& cf, std::vector<shared_sstable> candidates);
+    compaction_descriptor get_sstables_for_compaction(column_family& cfs, std::vector<lw_shared_ptr<sstable>> candidates);
 
     // Some strategies may look at the compacted and resulting sstables to
     // get some useful information for subsequent compactions.
-    void notify_completion(const std::vector<shared_sstable>& removed, const std::vector<shared_sstable>& added);
+    void notify_completion(const std::vector<lw_shared_ptr<sstable>>& removed, const std::vector<lw_shared_ptr<sstable>>& added);
 
     // Return if parallel compaction is allowed by strategy.
     bool parallel_compaction() const;
@@ -86,8 +79,6 @@ public:
             return "LeveledCompactionStrategy";
         case compaction_strategy_type::date_tiered:
             return "DateTieredCompactionStrategy";
-        case compaction_strategy_type::time_window:
-            return "TimeWindowCompactionStrategy";
         default:
             throw std::runtime_error("Invalid Compaction Strategy");
         }
@@ -106,8 +97,6 @@ public:
             return compaction_strategy_type::leveled;
         } else if (short_name == "DateTieredCompactionStrategy") {
             return compaction_strategy_type::date_tiered;
-        } else if (short_name == "TimeWindowCompactionStrategy") {
-            return compaction_strategy_type::time_window;
         } else {
             throw exceptions::configuration_exception(sprint("Unable to find compaction strategy class '%s'", name));
         }

compound.hh

@@ -130,10 +130,10 @@ public:
     bytes decompose_value(const value_type& values) {
         return serialize_value(values);
     }
-    class iterator : public std::iterator<std::input_iterator_tag, const bytes_view> {
+    class iterator : public std::iterator<std::input_iterator_tag, bytes_view> {
     private:
         bytes_view _v;
-        bytes_view _current;
+        value_type _current;
     private:
         void read_current() {
             size_type len;
@@ -220,9 +220,6 @@ public:
         assert(AllowPrefixes == allow_prefixes::yes);
         return std::distance(begin(v), end(v)) == (ssize_t)_types.size();
     }
-    bool is_empty(bytes_view v) const {
-        return begin(v) == end(v);
-    }
     void validate(bytes_view v) {
         // FIXME: implement
         warn(unimplemented::cause::VALIDATION);

compound_compat.hh

@@ -184,8 +184,6 @@ bytes to_legacy(CompoundType& type, bytes_view packed) {
     return legacy_form;
 }
 
-class composite_view;
-
 // Represents a value serialized according to Origin's CompositeType.
 // If is_compound is true, then the value is one or more components encoded as:
 //
@@ -204,7 +202,7 @@ public:
             , _is_compound(is_compound)
     { }
 
-    explicit composite(bytes&& b)
+    composite(bytes&& b)
             : _bytes(std::move(b))
             , _is_compound(true)
     { }
@@ -241,7 +239,7 @@ public:
     using component_view = std::pair<bytes_view, eoc>;
 private:
     template<typename Value, typename = std::enable_if_t<!std::is_same<const data_value, std::decay_t<Value>>::value>>
-    static size_t size(const Value& val) {
+    static size_t size(Value& val) {
         return val.size();
     }
     static size_t size(const data_value& val) {
@@ -306,36 +304,23 @@ public:
         return f(const_cast<bytes&>(_bytes));
     }
 
-    // marker is ignored if !is_compound
     template<typename RangeOfSerializedComponents>
-    static composite serialize_value(RangeOfSerializedComponents&& values, bool is_compound = true, eoc marker = eoc::none) {
+    static bytes serialize_value(RangeOfSerializedComponents&& values, bool is_compound = true) {
         auto size = serialized_size(values, is_compound);
         bytes b(bytes::initialized_later(), size);
         auto i = b.begin();
         serialize_value(std::forward<decltype(values)>(values), i, is_compound);
-        if (is_compound && !b.empty()) {
-            b.back() = eoc_type(marker);
-        }
-        return composite(std::move(b), is_compound);
-    }
-
-    template<typename RangeOfSerializedComponents>
-    static composite serialize_static(const schema& s, RangeOfSerializedComponents&& values) {
-        // FIXME: Optimize
-        auto b = bytes(size_t(2), bytes::value_type(0xff));
-        std::vector<bytes_view> sv(s.clustering_key_size());
-        b += composite::serialize_value(boost::range::join(sv, std::forward<RangeOfSerializedComponents>(values)), true).release_bytes();
-        return composite(std::move(b));
-    }
-
-    static eoc to_eoc(int8_t eoc_byte) {
-        return eoc_byte == 0 ? eoc::none : (eoc_byte < 0 ? eoc::start : eoc::end);
+        return b;
     }
 
     class iterator : public std::iterator<std::input_iterator_tag, const component_view> {
         bytes_view _v;
         component_view _current;
     private:
+        eoc to_eoc(int8_t eoc_byte) {
+            return eoc_byte == 0 ? eoc::none : (eoc_byte < 0 ? eoc::start : eoc::end);
+        }
+
         void read_current() {
             size_type len;
             {
@@ -421,10 +406,6 @@ public:
         return _bytes;
     }
 
-    bytes release_bytes() && {
-        return std::move(_bytes);
-    }
-
     size_t size() const {
         return _bytes.size();
     }
@@ -445,20 +426,26 @@ public:
         return _is_compound;
     }
 
+    // The following factory functions assume this composite is a compound value.
     template <typename ClusteringElement>
     static composite from_clustering_element(const schema& s, const ClusteringElement& ce) {
-        return serialize_value(ce.components(s), s.is_compound());
+        return serialize_value(ce.components(s));
     }
 
-    static composite from_exploded(const std::vector<bytes_view>& v, bool is_compound, eoc marker = eoc::none) {
+    static composite from_exploded(const std::vector<bytes_view>& v, eoc marker = eoc::none) {
         if (v.size() == 0) {
-            return composite(bytes(size_t(1), bytes::value_type(marker)), is_compound);
+            return bytes(size_t(1), bytes::value_type(marker));
         }
-        return serialize_value(v, is_compound, marker);
+        auto b = serialize_value(v);
+        b.back() = eoc_type(marker);
+        return composite(std::move(b));
     }
 
     static composite static_prefix(const schema& s) {
-        return serialize_static(s, std::vector<bytes_view>());
+        static bytes static_marker(size_t(2), bytes::value_type(0xff));
+
+        std::vector<bytes_view> sv(s.clustering_key_size());
+        return static_marker + serialize_value(sv);
     }
 
     explicit operator bytes_view() const {
@@ -469,15 +456,6 @@ public:
     friend inline std::ostream& operator<<(std::ostream& os, const std::pair<Component, eoc>& c) {
         return os << "{value=" << c.first << "; eoc=" << sprint("0x%02x", eoc_type(c.second) & 0xff) << "}";
     }
-
-    friend std::ostream& operator<<(std::ostream& os, const composite& v);
-
-    struct tri_compare {
-        const std::vector<data_type>& _types;
-        tri_compare(const std::vector<data_type>& types) : _types(types) {}
-        int operator()(const composite&, const composite&) const;
-        int operator()(composite_view, composite_view) const;
-    };
 };
 
 class composite_view final {
@@ -498,15 +476,14 @@ public:
             , _is_compound(true)
     { }
 
-    std::vector<bytes_view> explode() const {
+    std::vector<bytes> explode() const {
         if (!_is_compound) {
-            return { _bytes };
+            return { to_bytes(_bytes) };
         }
 
-        std::vector<bytes_view> ret;
-        ret.reserve(8);
+        std::vector<bytes> ret;
         for (auto it = begin(), e = end(); it != e; ) {
-            ret.push_back(it->first);
+            ret.push_back(to_bytes(it->first));
             auto marker = it->second;
             ++it;
             if (it != e && marker != composite::eoc::none) {
@@ -528,15 +505,6 @@ public:
         return { begin(), end() };
     }
 
-    composite::eoc last_eoc() const {
-        if (!_is_compound || _bytes.empty()) {
-            return composite::eoc::none;
-        }
-        bytes_view v(_bytes);
-        v.remove_prefix(v.size() - 1);
-        return composite::to_eoc(read_simple<composite::eoc_type>(v));
-    }
-
     auto values() const {
         return components() | boost::adaptors::transformed([](auto&& c) { return c.first; });
     }
@@ -559,46 +527,4 @@ public:
 
     bool operator==(const composite_view& k) const { return k._bytes == _bytes && k._is_compound == _is_compound; }
     bool operator!=(const composite_view& k) const { return !(k == *this); }
-
-    friend inline std::ostream& operator<<(std::ostream& os, composite_view v) {
-        return os << "{" << ::join(", ", v.components()) << ", compound=" << v._is_compound << ", static=" << v.is_static() << "}";
-    }
 };
-
-inline
-std::ostream& operator<<(std::ostream& os, const composite& v) {
-    return os << composite_view(v);
-}
-
-inline
-int composite::tri_compare::operator()(const composite& v1, const composite& v2) const {
-    return (*this)(composite_view(v1), composite_view(v2));
-}
-
-inline
-int composite::tri_compare::operator()(composite_view v1, composite_view v2) const {
-    // See org.apache.cassandra.db.composites.AbstractCType#compare
-    if (v1.empty()) {
-        return v2.empty() ? 0 : -1;
-    }
-    if (v2.empty()) {
-        return 1;
-    }
-    if (v1.is_static() != v2.is_static()) {
-        return v1.is_static() ? -1 : 1;
-    }
-    auto a_values = v1.components();
-    auto b_values = v2.components();
-    auto cmp = [&](const data_type& t, component_view c1, component_view c2) {
-        // First by value, then by EOC
-        auto r = t->compare(c1.first, c2.first);
-        if (r) {
-            return r;
-        }
-        return static_cast<int>(c1.second) - static_cast<int>(c2.second);
-    };
-    return lexicographical_tri_compare(_types.begin(), _types.end(),
-        a_values.begin(), a_values.end(),
-        b_values.begin(), b_values.end(),
-        cmp);
-}

conf/scylla.yaml

@@ -12,9 +12,7 @@
 
 # The name of the cluster. This is mainly used to prevent machines in
 # one logical cluster from joining another.
-# It is recommended to change the default value when creating a new cluster.
-# You can NOT modify this value for an existing cluster
-#cluster_name: 'Test Cluster'
+cluster_name: 'Test Cluster'
 
 # This defines the number of tokens randomly assigned to this node on the ring
 # The more tokens, relative to other nodes, the larger the proportion of data
@@ -87,26 +85,10 @@ listen_address: localhost
 # Leaving this blank will set it to the same value as listen_address
 # broadcast_address: 1.2.3.4
 
-
-# When using multiple physical network interfaces, set this to true to listen on broadcast_address
-# in addition to the listen_address, allowing nodes to communicate in both interfaces.
-# Ignore this property if the network configuration automatically routes between the public and private networks such as EC2.
-#
-# listen_on_broadcast_address: false
-
 # port for the CQL native transport to listen for clients on
 # For security reasons, you should not expose this port to the internet.  Firewall it if needed.
 native_transport_port: 9042
 
-# Enabling native transport encryption in client_encryption_options allows you to either use
-# encryption for the standard port or to use a dedicated, additional port along with the unencrypted
-# standard native_transport_port.
-# Enabling client encryption and keeping native_transport_port_ssl disabled will use encryption
-# for native_transport_port. Setting native_transport_port_ssl to a different value
-# from native_transport_port will use encryption for native_transport_port_ssl while
-# keeping native_transport_port unencrypted.
-#native_transport_port_ssl: 9142
-
 # Throttles all outbound streaming file transfers on this node to the
 # given total throughput in Mbps. This is necessary because Scylla does
 # mostly sequential IO when streaming data during bootstrap or repair, which
@@ -210,9 +192,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
 
-# Fail any multiple-partition batch exceeding this value. 50kb (10x warn threshold) by default.
-batch_size_fail_threshold_in_kb: 50
-
 # Authentication backend, identifying users
 # Out of the box, Scylla provides org.apache.cassandra.auth.{AllowAllAuthenticator,
 # PasswordAuthenticator}.
@@ -244,9 +223,6 @@ batch_size_fail_threshold_in_kb: 50
 # be set.
 # broadcast_rpc_address: 1.2.3.4
 
-# Uncomment to enable experimental features
-# experimental: true
-
 ###################################################
 ## Not currently supported, reserved for future use
 ###################################################
@@ -279,17 +255,17 @@ batch_size_fail_threshold_in_kb: 50
 
 # Validity period for permissions cache (fetching permissions can be an
 # expensive operation depending on the authorizer, CassandraAuthorizer is
-# one example). Defaults to 10000, set to 0 to disable.
+# one example). Defaults to 2000, set to 0 to disable.
 # Will be disabled automatically for AllowAllAuthorizer.
-# permissions_validity_in_ms: 10000
+# permissions_validity_in_ms: 2000
 
 # Refresh interval for permissions cache (if enabled).
 # After this interval, cache entries become eligible for refresh. Upon next
 # access, an async reload is scheduled and the old value returned until it
-# completes. If permissions_validity_in_ms is non-zero, then this also must have
-# a non-zero value. Defaults to 2000. It's recommended to set this value to
-# be at least 3 times smaller than the permissions_validity_in_ms.
-# permissions_update_interval_in_ms: 2000
+# completes. If permissions_validity_in_ms is non-zero, then this must be
+# also.
+# Defaults to the same value as permissions_validity_in_ms.
+# permissions_update_interval_in_ms: 1000
 
 # The partitioner is responsible for distributing groups of rows (by
 # partition key) across nodes in the cluster.  You should leave this
@@ -303,6 +279,28 @@ batch_size_fail_threshold_in_kb: 50
 #
 partitioner: org.apache.cassandra.dht.Murmur3Partitioner
 
+
+# policy for data disk failures:
+# die: shut down gossip and Thrift and kill the JVM for any fs errors or
+#      single-sstable errors, so the node can be replaced.
+# stop_paranoid: shut down gossip and Thrift even for single-sstable errors.
+# stop: shut down gossip and Thrift, leaving the node effectively dead, but
+#       can still be inspected via JMX.
+# best_effort: stop using the failed disk and respond to requests based on
+#              remaining available sstables.  This means you WILL see obsolete
+#              data at CL.ONE!
+# ignore: ignore fatal errors and let requests fail, as in pre-1.2 Scylla
+# disk_failure_policy: stop
+
+# policy for commit disk failures:
+# die: shut down gossip and Thrift and kill the JVM, so the node can be replaced.
+# stop: shut down gossip and Thrift, leaving the node effectively dead, but
+#       can still be inspected via JMX.
+# stop_commit: shutdown the commit log, letting writes collect but
+#              continuing to service reads, as in pre-2.0.5 Scylla
+# ignore: ignore fatal errors and let the batches fail
+# commit_failure_policy: stop
+
 # Maximum size of the key cache in memory.
 #
 # Each key cache hit saves 1 seek and each row cache hit saves 2 seeks at the
@@ -729,17 +727,22 @@ commitlog_total_space_in_mb: -1
 #    certificate: conf/scylla.crt
 #    keyfile: conf/scylla.key
 #    truststore: <none, use system trust>
-#    require_client_auth: False
-#    priority_string: <none, use default>
 
 # enable or disable client/server encryption.
 # client_encryption_options:
 #    enabled: false
 #    certificate: conf/scylla.crt
 #    keyfile: conf/scylla.key
-#    truststore: <none, use system trust>
-#    require_client_auth: False
-#    priority_string: <none, use default>
+
+    # require_client_auth: false
+    # Set trustore and truststore_password if require_client_auth is true
+    # truststore: conf/.truststore
+    # truststore_password: cassandra
+    # More advanced defaults below:
+    # protocol: TLS
+    # algorithm: SunX509
+    # store_type: JKS
+    # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA]
 
 # internode_compression controls whether traffic between nodes is
 # compressed.

configure.py

@@ -86,14 +86,14 @@ def try_compile(compiler, source = '', flags = []):
     with tempfile.NamedTemporaryFile() as sfile:
         sfile.file.write(bytes(source, 'utf-8'))
         sfile.file.flush()
-        return subprocess.call([compiler, '-x', 'c++', '-o', '/dev/null', '-c', sfile.name] + args.user_cflags.split() + flags,
+        return subprocess.call([compiler, '-x', 'c++', '-o', '/dev/null', '-c', sfile.name] + flags,
                                stdout = subprocess.DEVNULL,
                                stderr = subprocess.DEVNULL) == 0
 
 def warning_supported(warning, compiler):
     # gcc ignores -Wno-x even if it is not supported
     adjusted = re.sub('^-Wno-', '-W', warning)
-    return try_compile(flags = ['-Werror', adjusted], compiler = compiler)
+    return try_compile(flags = [adjusted], compiler = compiler)
 
 def debug_flag(compiler):
     src_with_auto = textwrap.dedent('''\
@@ -167,9 +167,7 @@ modes = {
 
 scylla_tests = [
     'tests/mutation_test',
-    'tests/mvcc_test',
     'tests/streamed_mutation_test',
-    'tests/flat_mutation_reader_test',
     'tests/schema_registry_test',
     'tests/canonical_mutation_test',
     'tests/range_test',
@@ -177,8 +175,6 @@ scylla_tests = [
     'tests/keys_test',
     'tests/partitioner_test',
     'tests/frozen_mutation_test',
-    'tests/serialized_action_test',
-    'tests/clustering_ranges_walker_test',
     'tests/perf/perf_mutation',
     'tests/lsa_async_eviction_test',
     'tests/lsa_sync_eviction_test',
@@ -187,10 +183,6 @@ scylla_tests = [
     'tests/perf/perf_hash',
     'tests/perf/perf_cql_parser',
     'tests/perf/perf_simple_query',
-    'tests/perf/perf_fast_forward',
-    'tests/perf/perf_cache_eviction',
-    'tests/cache_flat_mutation_reader_test',
-    'tests/row_cache_stress_test',
     'tests/memory_footprint',
     'tests/perf/perf_sstable',
     'tests/cql_query_test',
@@ -202,7 +194,6 @@ scylla_tests = [
     'tests/test-serialization',
     'tests/sstable_test',
     'tests/sstable_mutation_test',
-    'tests/sstable_resharding_test',
     'tests/memtable_test',
     'tests/commitlog_test',
     'tests/cartesian_product_test',
@@ -224,7 +215,6 @@ scylla_tests = [
     'tests/murmur_hash_test',
     'tests/allocation_strategy_test',
     'tests/logalloc_test',
-    'tests/log_heap_test',
     'tests/managed_vector_test',
     'tests/crc_test',
     'tests/flush_queue_test',
@@ -241,15 +231,6 @@ scylla_tests = [
     'tests/view_schema_test',
     'tests/counter_test',
     'tests/cell_locker_test',
-    'tests/streaming_histogram_test',
-    'tests/duration_test',
-    'tests/vint_serialization_test',
-    'tests/compress_test',
-    'tests/chunked_vector_test',
-    'tests/loading_cache_test',
-    'tests/castas_fcts_test',
-    'tests/big_decimal_test',
-    'tests/aggregate_fcts_test',
 ]
 
 apps = [
@@ -280,8 +261,6 @@ arg_parser.add_argument('--ldflags', action = 'store', dest = 'user_ldflags', de
                         help = 'Extra flags for the linker')
 arg_parser.add_argument('--compiler', action = 'store', dest = 'cxx', default = 'g++',
                         help = 'C++ compiler path')
-arg_parser.add_argument('--c-compiler', action='store', dest='cc', default='gcc',
-                        help='C compiler path')
 arg_parser.add_argument('--with-osv', action = 'store', dest = 'with_osv', default = '',
                         help = 'Shortcut for compile for OSv')
 arg_parser.add_argument('--enable-dpdk', action = 'store_true', dest = 'dpdk', default = False,
@@ -302,10 +281,6 @@ arg_parser.add_argument('--python', action = 'store', dest = 'python', default =
                         help = 'Python3 path')
 add_tristate(arg_parser, name = 'hwloc', dest = 'hwloc', help = 'hwloc support')
 add_tristate(arg_parser, name = 'xen', dest = 'xen', help = 'Xen support')
-arg_parser.add_argument('--enable-gcc6-concepts', dest='gcc6_concepts', action='store_true', default=False,
-                        help='enable experimental support for C++ Concepts as implemented in GCC 6')
-arg_parser.add_argument('--enable-alloc-failure-injector', dest='alloc_failure_injector', action='store_true', default=False,
-                        help='enable allocation failure injection')
 args = arg_parser.parse_args()
 
 defines = []
@@ -335,7 +310,6 @@ scylla_core = (['database.cc',
                  'mutation_partition_view.cc',
                  'mutation_partition_serializer.cc',
                  'mutation_reader.cc',
-                 'flat_mutation_reader.cc',
                  'mutation_query.cc',
                  'keys.cc',
                  'counters.cc',
@@ -343,11 +317,11 @@ scylla_core = (['database.cc',
                  'sstables/compress.cc',
                  'sstables/row.cc',
                  'sstables/partition.cc',
+                 'sstables/filter.cc',
                  'sstables/compaction.cc',
                  'sstables/compaction_strategy.cc',
                  'sstables/compaction_manager.cc',
                  'sstables/atomic_deletion.cc',
-                 'sstables/integrity_checked_file_impl.cc',
                  'transport/event.cc',
                  'transport/event_notifier.cc',
                  'transport/server.cc',
@@ -362,7 +336,6 @@ scylla_core = (['database.cc',
                  'cql3/sets.cc',
                  'cql3/maps.cc',
                  'cql3/functions/functions.cc',
-                 'cql3/functions/castas_fcts.cc',
                  'cql3/statements/cf_prop_defs.cc',
                  'cql3/statements/cf_statement.cc',
                  'cql3/statements/authentication_statement.cc',
@@ -371,7 +344,6 @@ scylla_core = (['database.cc',
                  'cql3/statements/create_view_statement.cc',
                  'cql3/statements/create_type_statement.cc',
                  'cql3/statements/create_user_statement.cc',
-                 'cql3/statements/drop_index_statement.cc',
                  'cql3/statements/drop_keyspace_statement.cc',
                  'cql3/statements/drop_table_statement.cc',
                  'cql3/statements/drop_view_statement.cc',
@@ -441,18 +413,13 @@ scylla_core = (['database.cc',
                  'db/consistency_level.cc',
                  'db/system_keyspace.cc',
                  'db/schema_tables.cc',
-                 'db/cql_type_parser.cc',
-                 'db/legacy_schema_migrator.cc',
                  'db/commitlog/commitlog.cc',
                  'db/commitlog/commitlog_replayer.cc',
                  'db/commitlog/commitlog_entry.cc',
                  'db/config.cc',
-                 'db/heat_load_balance.cc',
                  'db/index/secondary_index.cc',
                  'db/marshal/type_parser.cc',
                  'db/batchlog_manager.cc',
-                 'db/view/view.cc',
-                 'index/secondary_index_manager.cc',
                  'io/io.cc',
                  'utils/utils.cc',
                  'utils/UUID_gen.cc',
@@ -464,7 +431,6 @@ scylla_core = (['database.cc',
                  'utils/dynamic_bitset.cc',
                  'utils/managed_bytes.cc',
                  'utils/exceptions.cc',
-                 'utils/config_file.cc',
                  'gms/version_generator.cc',
                  'gms/versioned_value.cc',
                  'gms/gossiper.cc',
@@ -474,7 +440,6 @@ scylla_core = (['database.cc',
                  'gms/gossip_digest_ack2.cc',
                  'gms/endpoint_state.cc',
                  'gms/application_state.cc',
-                 'gms/inet_address.cc',
                  'dht/i_partitioner.cc',
                  'dht/murmur3_partitioner.cc',
                  'dht/byte_ordered_partitioner.cc',
@@ -502,7 +467,7 @@ scylla_core = (['database.cc',
                  'service/client_state.cc',
                  'service/migration_task.cc',
                  'service/storage_service.cc',
-                 'service/misc_services.cc',
+                 'service/load_broadcaster.cc',
                  'service/pager/paging_state.cc',
                  'service/pager/query_pagers.cc',
                  'streaming/stream_task.cc',
@@ -518,33 +483,26 @@ scylla_core = (['database.cc',
                  'streaming/stream_manager.cc',
                  'streaming/stream_result_future.cc',
                  'streaming/stream_session_state.cc',
-                 'clocks-impl.cc',
+                 'gc_clock.cc',
                  'partition_slice_builder.cc',
                  'init.cc',
-                 'lister.cc',
                  'repair/repair.cc',
                  'exceptions/exceptions.cc',
-                 'auth/allow_all_authenticator.cc',
-                 'auth/allow_all_authorizer.cc',
+                 'dns.cc',
+                 'auth/auth.cc',
                  'auth/authenticated_user.cc',
                  'auth/authenticator.cc',
-                 'auth/common.cc',
+                 'auth/authorizer.cc',
                  'auth/default_authorizer.cc',
                  'auth/data_resource.cc',
                  'auth/password_authenticator.cc',
                  'auth/permission.cc',
-                 'auth/permissions_cache.cc',
-                 'auth/service.cc',
-                 'auth/transitional.cc',
                  'tracing/tracing.cc',
                  'tracing/trace_keyspace_helper.cc',
                  'tracing/trace_state.cc',
-                 'table_helper.cc',
                  'range_tombstone.cc',
                  'range_tombstone_list.cc',
-                 'disk-error-handler.cc',
-                 'duration.cc',
-                 'vint-serialization.cc',
+                 'disk-error-handler.cc'
                  ]
                 + [Antlr3Grammar('cql3/Cql.g')]
                 + [Thrift('interface/cassandra.thrift', 'Cassandra')]
@@ -606,7 +564,6 @@ idls = ['idl/gossip_digest.idl.hh',
         'idl/commitlog.idl.hh',
         'idl/tracing.idl.hh',
         'idl/consistency_level.idl.hh',
-        'idl/cache_temperature.idl.hh',
         ]
 
 scylla_tests_dependencies = scylla_core + api + idls + [
@@ -640,12 +597,6 @@ pure_boost_tests = set([
     'tests/dynamic_bitset_test',
     'tests/idl_test',
     'tests/cartesian_product_test',
-    'tests/streaming_histogram_test',
-    'tests/duration_test',
-    'tests/vint_serialization_test',
-    'tests/compress_test',
-    'tests/chunked_vector_test',
-    'tests/big_decimal_test',
 ])
 
 tests_not_using_seastar_test_framework = set([
@@ -658,9 +609,6 @@ tests_not_using_seastar_test_framework = set([
     'tests/perf/perf_cql_parser',
     'tests/message',
     'tests/perf/perf_simple_query',
-    'tests/perf/perf_fast_forward',
-    'tests/perf/perf_cache_eviction',
-    'tests/row_cache_stress_test',
     'tests/memory_footprint',
     'tests/gossip',
     'tests/perf/perf_sstable',
@@ -678,39 +626,25 @@ for t in scylla_tests:
     else:
         deps[t] += scylla_core + api + idls + ['tests/cql_test_env.cc']
 
-deps['tests/sstable_test'] += ['tests/sstable_datafile_test.cc', 'tests/sstable_utils.cc']
-deps['tests/mutation_reader_test'] += ['tests/sstable_utils.cc']
+deps['tests/sstable_test'] += ['tests/sstable_datafile_test.cc']
 
-deps['tests/bytes_ostream_test'] = ['tests/bytes_ostream_test.cc', 'utils/managed_bytes.cc', 'utils/logalloc.cc', 'utils/dynamic_bitset.cc']
+deps['tests/bytes_ostream_test'] = ['tests/bytes_ostream_test.cc']
 deps['tests/input_stream_test'] = ['tests/input_stream_test.cc']
-deps['tests/UUID_test'] = ['utils/UUID_gen.cc', 'tests/UUID_test.cc', 'utils/uuid.cc', 'utils/managed_bytes.cc', 'utils/logalloc.cc', 'utils/dynamic_bitset.cc']
+deps['tests/UUID_test'] = ['utils/UUID_gen.cc', 'tests/UUID_test.cc', 'utils/uuid.cc']
 deps['tests/murmur_hash_test'] = ['bytes.cc', 'utils/murmur_hash.cc', 'tests/murmur_hash_test.cc']
 deps['tests/allocation_strategy_test'] = ['tests/allocation_strategy_test.cc', 'utils/logalloc.cc', 'utils/dynamic_bitset.cc']
-deps['tests/log_heap_test'] = ['tests/log_heap_test.cc']
 deps['tests/anchorless_list_test'] = ['tests/anchorless_list_test.cc']
 
 warnings = [
     '-Wno-mismatched-tags',  # clang-only
     '-Wno-maybe-uninitialized', # false positives on gcc 5
-    '-Wno-tautological-compare',
-    '-Wno-parentheses-equality',
-    '-Wno-c++11-narrowing',
-    '-Wno-c++1z-extensions',
-    '-Wno-sometimes-uninitialized',
-    '-Wno-return-stack-address',
-    '-Wno-missing-braces',
-    '-Wno-unused-lambda-capture',
-    '-Wno-misleading-indentation',
-    '-Wno-overflow',
-    '-Wno-noexcept-type',
-    '-Wno-nonnull-compare'
     ]
 
 warnings = [w
             for w in warnings
             if warning_supported(warning = w, compiler = args.cxx)]
 
-warnings = ' '.join(warnings + ['-Wno-error=deprecated-declarations'])
+warnings = ' '.join(warnings)
 
 dbgflag = debug_flag(args.cxx) if args.debuginfo else ''
 tests_link_rule = 'link' if args.tests_debuginfo else 'link_stripped'
@@ -764,9 +698,6 @@ if not try_compile(compiler=args.cxx, source='''\
     print('Installed boost version too old.  Please update {}.'.format(pkgname("boost-devel")))
     sys.exit(1)
 
-
-has_sanitize_address_use_after_scope = try_compile(compiler=args.cxx, flags=['-fsanitize-address-use-after-scope'], source='int f() {}')
-
 defines = ' '.join(['-D' + d for d in defines])
 
 globals().update(vars(args))
@@ -789,7 +720,7 @@ scylla_release = file.read().strip()
 
 extra_cxxflags["release.cc"] = "-DSCYLLA_VERSION=\"\\\"" + scylla_version + "\\\"\" -DSCYLLA_RELEASE=\"\\\"" + scylla_release + "\\\"\""
 
-seastar_flags = []
+seastar_flags = ['--disable-xen']
 if args.dpdk:
     # fake dependencies on dpdk, so that it is built before anything else
     seastar_flags += ['--enable-dpdk']
@@ -799,14 +730,9 @@ if args.staticcxx:
     seastar_flags += ['--static-stdc++']
 if args.staticboost:
     seastar_flags += ['--static-boost']
-if args.gcc6_concepts:
-    seastar_flags += ['--enable-gcc6-concepts']
-if args.alloc_failure_injector:
-    seastar_flags += ['--enable-alloc-failure-injector']
 
 seastar_cflags = args.user_cflags + " -march=nehalem"
-seastar_ldflags = args.user_ldflags
-seastar_flags += ['--compiler', args.cxx, '--c-compiler', args.cc, '--cflags=%s' % (seastar_cflags), '--ldflags=%s' %(seastar_ldflags)]
+seastar_flags += ['--compiler', args.cxx, '--cflags=%s' % (seastar_cflags)]
 
 status = subprocess.call([python, './configure.py'] + seastar_flags, cwd = 'seastar')
 
@@ -870,7 +796,7 @@ with open(buildfile, 'w') as f:
         builddir = {outdir}
         cxx = {cxx}
         cxxflags = {user_cflags} {warnings} {defines}
-        ldflags = -fuse-ld=gold {user_ldflags}
+        ldflags = {user_ldflags}
         libs = {libs}
         pool link_pool
             depth = {link_pool_depth}
@@ -901,7 +827,7 @@ with open(buildfile, 'w') as f:
         f.write(textwrap.dedent('''\
             cxxflags_{mode} = -I. -I $builddir/{mode}/gen -I seastar -I seastar/build/{mode}/gen
             rule cxx.{mode}
-              command = $cxx -MD -MT $out -MF $out.d {seastar_cflags} $cxxflags $cxxflags_{mode} $obj_cxxflags -c -o $out $in
+              command = $cxx -MD -MT $out -MF $out.d {seastar_cflags} $cxxflags $cxxflags_{mode} -c -o $out $in
               description = CXX $out
               depfile = $out.d
             rule link.{mode}
@@ -919,17 +845,7 @@ with open(buildfile, 'w') as f:
                 command = thrift -gen cpp:cob_style -out $builddir/{mode}/gen $in
                 description = THRIFT $in
             rule antlr3.{mode}
-                # We replace many local `ExceptionBaseType* ex` variables with a single function-scope one.
-                # Because we add such a variable to every function, and because `ExceptionBaseType` is not a global
-                # name, we also add a global typedef to avoid compilation errors. 
-                command = sed -e '/^#if 0/,/^#endif/d' $in > $builddir/{mode}/gen/$in $
-                     && antlr3 $builddir/{mode}/gen/$in $
-                     && sed -i -e 's/^\\( *\)\\(ImplTraits::CommonTokenType\\* [a-zA-Z0-9_]* = NULL;\\)$$/\\1const \\2/' $
-                        -e '1i using ExceptionBaseType = int;' $
-                        -e 's/^{{/{{ ExceptionBaseType\* ex = nullptr;/; $
-                            s/ExceptionBaseType\* ex = new/ex = new/; $
-                            s/exceptions::syntax_exception e/exceptions::syntax_exception\& e/' $
-                        build/{mode}/gen/${{stem}}Parser.cpp
+                command = sed -e '/^#if 0/,/^#endif/d' $in > $builddir/{mode}/gen/$in && antlr3 $builddir/{mode}/gen/$in && sed -i 's/^\\( *\)\\(ImplTraits::CommonTokenType\\* [a-zA-Z0-9_]* = NULL;\\)$$/\\1const \\2/' build/{mode}/gen/${{stem}}Parser.cpp
                 description = ANTLR3 $in
             ''').format(mode = mode, **modeval))
         f.write('build {mode}: phony {artifacts}\n'.format(mode = mode,
@@ -954,7 +870,19 @@ with open(buildfile, 'w') as f:
                     objs += dep.objects('$builddir/' + mode + '/gen')
                 if isinstance(dep, Antlr3Grammar):
                     objs += dep.objects('$builddir/' + mode + '/gen')
-            if binary.endswith('.a'):
+            if binary.endswith('.pc'):
+                vars = modeval.copy()
+                vars.update(globals())
+                pc = textwrap.dedent('''\
+                        Name: Seastar
+                        URL: http://seastar-project.org/
+                        Description: Advanced C++ framework for high-performance server applications on modern hardware.
+                        Version: 1.0
+                        Libs: -L{srcdir}/{builddir} -Wl,--whole-archive -lseastar -Wl,--no-whole-archive {dbgflag} -Wl,--no-as-needed {static} {pie} -fvisibility=hidden -pthread {user_ldflags} {libs} {sanitize_libs}
+                        Cflags: -std=gnu++1y {dbgflag} {fpie} -Wall -Werror -fvisibility=hidden -pthread -I{srcdir} -I{srcdir}/{builddir}/gen {user_cflags} {warnings} {defines} {sanitize} {opt}
+                        ''').format(builddir = 'build/' + mode, srcdir = os.getcwd(), **vars)
+                f.write('build $builddir/{}/{}: gen\n  text = {}\n'.format(mode, binary, repr(pc)))
+            elif binary.endswith('.a'):
                 f.write('build $builddir/{}/{}: ar.{} {}\n'.format(mode, binary, mode, str.join(' ', objs)))
             else:
                 if binary.startswith('tests/'):
@@ -1017,7 +945,7 @@ with open(buildfile, 'w') as f:
             f.write('build {}: ragel {}\n'.format(hh, src))
         for hh in swaggers:
             src = swaggers[hh]
-            f.write('build {}: swagger {} | seastar/json/json2code.py\n'.format(hh,src))
+            f.write('build {}: swagger {}\n'.format(hh,src))
         for hh in serializers:
             src = serializers[hh]
             f.write('build {}: serializer {} | idl-compiler.py\n'.format(hh,src))
@@ -1034,9 +962,6 @@ with open(buildfile, 'w') as f:
             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)))
-                if cc.endswith('Parser.cpp') and has_sanitize_address_use_after_scope:
-                    # Parsers end up using huge amounts of stack space and overflowing their stack 
-                    f.write('  obj_cxxflags = -fno-sanitize-address-use-after-scope\n')
         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('  pool = seastar_pool\n')

converting_mutation_partition_applier.hh

@@ -22,7 +22,6 @@
 #pragma once
 
 #include "mutation_partition_view.hh"
-#include "mutation_partition.hh"
 #include "schema.hh"
 
 // Mutation partition visitor which applies visited data into
@@ -38,12 +37,12 @@ private:
     static bool is_compatible(const column_definition& new_def, const data_type& old_type, column_kind kind) {
         return ::is_compatible(new_def.kind, kind) && new_def.type->is_value_compatible_with(*old_type);
     }
-    static void accept_cell(row& dst, column_kind kind, const column_definition& new_def, const data_type& old_type, atomic_cell_view cell) {
+    void accept_cell(row& dst, column_kind kind, const column_definition& new_def, const data_type& old_type, atomic_cell_view cell) {
         if (is_compatible(new_def, old_type, kind) && cell.timestamp() > new_def.dropped_at()) {
             dst.apply(new_def, atomic_cell_or_collection(cell));
         }
     }
-    static void accept_cell(row& dst, column_kind kind, const column_definition& new_def, const data_type& old_type, collection_mutation_view cell) {
+    void accept_cell(row& dst, column_kind kind, const column_definition& new_def, const data_type& old_type, collection_mutation_view cell) {
         if (!is_compatible(new_def, old_type, kind)) {
             return;
         }
@@ -95,8 +94,8 @@ public:
         _p.apply_row_tombstone(_p_schema, rt);
     }
 
-    virtual void accept_row(position_in_partition_view key, const row_tombstone& deleted_at, const row_marker& rm, is_dummy dummy, is_continuous continuous) override {
-        deletable_row& r = _p.clustered_row(_p_schema, key, dummy, continuous);
+    virtual void accept_row(clustering_key_view key, tombstone deleted_at, const row_marker& rm) override {
+        deletable_row& r = _p.clustered_row(_p_schema, key);
         r.apply(rm);
         r.apply(deleted_at);
         _current_row = &r;
@@ -117,14 +116,4 @@ public:
             accept_cell(_current_row->cells(), column_kind::regular_column, *def, col.type(), collection);
         }
     }
-
-    // Appends the cell to dst upgrading it to the new schema.
-    // Cells must have monotonic names.
-    static void append_cell(row& dst, column_kind kind, const column_definition& new_def, const data_type& old_type, const atomic_cell_or_collection& cell) {
-        if (new_def.is_atomic()) {
-            accept_cell(dst, kind, new_def, old_type, cell.as_atomic_cell());
-        } else {
-            accept_cell(dst, kind, new_def, old_type, cell.as_collection_mutation());
-        }
-    }
 };

counters.cc

@@ -78,79 +78,10 @@ std::vector<counter_shard> counter_cell_view::shards_compatible_with_1_7_4() con
     return sorted_shards;
 }
 
-static bool apply_in_place(atomic_cell_or_collection& dst, atomic_cell_or_collection& src)
-{
-    auto dst_ccmv = counter_cell_mutable_view(dst.as_mutable_atomic_cell());
-    auto src_ccmv = counter_cell_mutable_view(src.as_mutable_atomic_cell());
-    auto dst_shards = dst_ccmv.shards();
-    auto src_shards = src_ccmv.shards();
-
-    auto dst_it = dst_shards.begin();
-    auto src_it = src_shards.begin();
-
-    while (src_it != src_shards.end()) {
-        while (dst_it != dst_shards.end() && dst_it->id() < src_it->id()) {
-            ++dst_it;
-        }
-        if (dst_it == dst_shards.end() || dst_it->id() != src_it->id()) {
-            // Fast-path failed. Revert and fall back to the slow path.
-            if (dst_it == dst_shards.end()) {
-                --dst_it;
-            }
-            while (src_it != src_shards.begin()) {
-                --src_it;
-                while (dst_it->id() != src_it->id()) {
-                    --dst_it;
-                }
-                src_it->swap_value_and_clock(*dst_it);
-            }
-            return false;
-        }
-        if (dst_it->logical_clock() < src_it->logical_clock()) {
-            dst_it->swap_value_and_clock(*src_it);
-        } else {
-            src_it->set_value_and_clock(*dst_it);
-        }
-        ++src_it;
-    }
-
-    auto dst_ts = dst_ccmv.timestamp();
-    auto src_ts = src_ccmv.timestamp();
-    dst_ccmv.set_timestamp(std::max(dst_ts, src_ts));
-    src_ccmv.set_timestamp(dst_ts);
-    src.as_mutable_atomic_cell().set_counter_in_place_revert(true);
-    return true;
-}
-
-static void revert_in_place_apply(atomic_cell_or_collection& dst, atomic_cell_or_collection& src)
-{
-    assert(dst.can_use_mutable_view() && src.can_use_mutable_view());
-    auto dst_ccmv = counter_cell_mutable_view(dst.as_mutable_atomic_cell());
-    auto src_ccmv = counter_cell_mutable_view(src.as_mutable_atomic_cell());
-    auto dst_shards = dst_ccmv.shards();
-    auto src_shards = src_ccmv.shards();
-
-    auto dst_it = dst_shards.begin();
-    auto src_it = src_shards.begin();
-
-    while (src_it != src_shards.end()) {
-        while (dst_it != dst_shards.end() && dst_it->id() < src_it->id()) {
-            ++dst_it;
-        }
-        assert(dst_it != dst_shards.end() && dst_it->id() == src_it->id());
-        dst_it->swap_value_and_clock(*src_it);
-        ++src_it;
-    }
-
-    auto dst_ts = dst_ccmv.timestamp();
-    auto src_ts = src_ccmv.timestamp();
-    dst_ccmv.set_timestamp(src_ts);
-    src_ccmv.set_timestamp(dst_ts);
-    src.as_mutable_atomic_cell().set_counter_in_place_revert(false);
-}
-
 bool counter_cell_view::apply_reversibly(atomic_cell_or_collection& dst, atomic_cell_or_collection& src)
 {
+    // TODO: optimise for single shard existing in the other
+    // TODO: optimise for no new shards?
     auto dst_ac = dst.as_atomic_cell();
     auto src_ac = src.as_atomic_cell();
 
@@ -163,29 +94,23 @@ bool counter_cell_view::apply_reversibly(atomic_cell_or_collection& dst, atomic_
     }
 
     if (dst_ac.is_counter_update() && src_ac.is_counter_update()) {
-        auto src_v = src_ac.counter_update_value();
-        auto dst_v = dst_ac.counter_update_value();
+        // FIXME: store deltas just as a normal int64_t and get rid of these calls
+        // to long_type
+        auto src_v = value_cast<int64_t>(long_type->deserialize_value(src_ac.value()));
+        auto dst_v = value_cast<int64_t>(long_type->deserialize_value(dst_ac.value()));
         dst = atomic_cell::make_live_counter_update(std::max(dst_ac.timestamp(), src_ac.timestamp()),
-                                                    src_v + dst_v);
+                                                    long_type->decompose(src_v + dst_v));
         return true;
     }
 
     assert(!dst_ac.is_counter_update());
     assert(!src_ac.is_counter_update());
 
-    if (counter_cell_view(dst_ac).shard_count() >= counter_cell_view(src_ac).shard_count()
-        && dst.can_use_mutable_view() && src.can_use_mutable_view()) {
-        if (apply_in_place(dst, src)) {
-            return true;
-        }
-    }
-
-    src.as_mutable_atomic_cell().set_counter_in_place_revert(false);
-    auto dst_shards = counter_cell_view(dst_ac).shards();
-    auto src_shards = counter_cell_view(src_ac).shards();
+    auto a_shards = counter_cell_view(dst_ac).shards();
+    auto b_shards = counter_cell_view(src_ac).shards();
 
     counter_cell_builder result;
-    combine(dst_shards.begin(), dst_shards.end(), src_shards.begin(), src_shards.end(),
+    combine(a_shards.begin(), a_shards.end(), b_shards.begin(), b_shards.end(),
             result.inserter(), counter_shard_view::less_compare_by_id(), [] (auto& x, auto& y) {
                 return x.logical_clock() < y.logical_clock() ? y : x;
             });
@@ -198,12 +123,10 @@ bool counter_cell_view::apply_reversibly(atomic_cell_or_collection& dst, atomic_
 void counter_cell_view::revert_apply(atomic_cell_or_collection& dst, atomic_cell_or_collection& src)
 {
     if (dst.as_atomic_cell().is_counter_update()) {
-        auto src_v = src.as_atomic_cell().counter_update_value();
-        auto dst_v = dst.as_atomic_cell().counter_update_value();
+        auto src_v = value_cast<int64_t>(long_type->deserialize_value(src.as_atomic_cell().value()));
+        auto dst_v = value_cast<int64_t>(long_type->deserialize_value(dst.as_atomic_cell().value()));
         dst = atomic_cell::make_live(dst.as_atomic_cell().timestamp(),
                                      long_type->decompose(dst_v - src_v));
-    } else if (src.as_atomic_cell().is_counter_in_place_revert_set()) {
-        revert_in_place_apply(dst, src);
     } else {
         std::swap(dst, src);
     }
@@ -214,11 +137,10 @@ stdx::optional<atomic_cell> counter_cell_view::difference(atomic_cell_view a, at
     assert(!a.is_counter_update());
     assert(!b.is_counter_update());
 
-    if (!b.is_live() || !a.is_live()) {
-        if (b.is_live() || (!a.is_live() && compare_atomic_cell_for_merge(b, a) < 0)) {
-            return atomic_cell(a);
-        }
+    if (!b.is_live()) {
         return { };
+    } else if (!a.is_live()) {
+        return atomic_cell(a);
     }
 
     auto a_shards = counter_cell_view(a).shards();
@@ -259,9 +181,10 @@ void transform_counter_updates_to_shards(mutation& m, const mutation* current_st
             if (!acv.is_live()) {
                 return; // continue -- we are in lambda
             }
-            auto delta = acv.counter_update_value();
-            auto cs = counter_shard(counter_id::local(), delta, clock_offset + 1);
-            ac_o_c = counter_cell_builder::from_single_shard(acv.timestamp(), cs);
+            auto delta = value_cast<int64_t>(long_type->deserialize_value(acv.value()));
+            counter_cell_builder ccb;
+            ccb.add_shard(counter_shard(counter_id::local(), delta, clock_offset + 1));
+            ac_o_c = ccb.build(acv.timestamp());
         });
     };
 
@@ -276,10 +199,17 @@ void transform_counter_updates_to_shards(mutation& m, const mutation* current_st
     clustering_key::less_compare cmp(*m.schema());
 
     auto transform_row_to_shards = [clock_offset] (auto& transformee, auto& state) {
-        std::deque<std::pair<column_id, counter_shard>> shards;
+        struct counter_shard_or_tombstone {
+            stdx::optional<counter_shard> shard;
+            tombstone tomb;
+        };
+        std::deque<std::pair<column_id, counter_shard_or_tombstone>> shards;
         state.for_each_cell([&] (column_id id, const atomic_cell_or_collection& ac_o_c) {
             auto acv = ac_o_c.as_atomic_cell();
             if (!acv.is_live()) {
+                counter_shard_or_tombstone cs_o_t { { },
+                                                    tombstone(acv.timestamp(), acv.deletion_time()) };
+                shards.emplace_back(std::make_pair(id, cs_o_t));
                 return; // continue -- we are in lambda
             }
             counter_cell_view ccv(acv);
@@ -287,7 +217,7 @@ void transform_counter_updates_to_shards(mutation& m, const mutation* current_st
             if (!cs) {
                 return; // continue
             }
-            shards.emplace_back(std::make_pair(id, counter_shard(*cs)));
+            shards.emplace_back(std::make_pair(id, counter_shard_or_tombstone { counter_shard(*cs), tombstone() }));
         });
 
         transformee.for_each_cell([&] (column_id id, atomic_cell_or_collection& ac_o_c) {
@@ -299,17 +229,26 @@ void transform_counter_updates_to_shards(mutation& m, const mutation* current_st
                 shards.pop_front();
             }
 
-            auto delta = acv.counter_update_value();
+            auto delta = value_cast<int64_t>(long_type->deserialize_value(acv.value()));
 
+            counter_cell_builder ccb;
             if (shards.empty() || shards.front().first > id) {
-                auto cs = counter_shard(counter_id::local(), delta, clock_offset + 1);
-                ac_o_c = counter_cell_builder::from_single_shard(acv.timestamp(), cs);
-            } else {
-                auto& cs = shards.front().second;
+                ccb.add_shard(counter_shard(counter_id::local(), delta, clock_offset + 1));
+            } else if (shards.front().second.tomb.timestamp == api::missing_timestamp) {
+                auto& cs = *shards.front().second.shard;
                 cs.update(delta, clock_offset + 1);
-                ac_o_c = counter_cell_builder::from_single_shard(acv.timestamp(), cs);
+                ccb.add_shard(cs);
                 shards.pop_front();
+            } else {
+                // We are apply the tombstone that's already there second time.
+                // It is not necessary but there is no easy way to remove cell
+                // from a mutation.
+                tombstone t = shards.front().second.tomb;
+                ac_o_c = atomic_cell::make_dead(t.timestamp, t.deletion_time);
+                shards.pop_front();
+                return; // continue -- we are in lambda
             }
+            ac_o_c = ccb.build(acv.timestamp());
         });
     };
 

counters.hh

@@ -79,8 +79,7 @@ static_assert(std::is_pod<counter_id>::value, "counter_id should be a POD type")
 
 std::ostream& operator<<(std::ostream& os, const counter_id& id);
 
-template<typename View>
-class basic_counter_shard_view {
+class counter_shard_view {
     enum class offset : unsigned {
         id = 0u,
         value = unsigned(id) + sizeof(counter_id),
@@ -88,58 +87,40 @@ class basic_counter_shard_view {
         total_size = unsigned(logical_clock) + sizeof(int64_t),
     };
 private:
-    typename View::pointer _base;
+    bytes_view::const_pointer _base;
 private:
     template<typename T>
     T read(offset off) const {
         T value;
-        std::copy_n(_base + static_cast<unsigned>(off), sizeof(T), reinterpret_cast<signed char*>(&value));
+        std::copy_n(_base + static_cast<unsigned>(off), sizeof(T), reinterpret_cast<char*>(&value));
         return value;
     }
 public:
     static constexpr auto size = size_t(offset::total_size);
 public:
-    basic_counter_shard_view() = default;
-    explicit basic_counter_shard_view(typename View::pointer ptr) noexcept
+    counter_shard_view() = default;
+    explicit counter_shard_view(bytes_view::const_pointer ptr) noexcept
         : _base(ptr) { }
 
     counter_id id() const { return read<counter_id>(offset::id); }
     int64_t value() const { return read<int64_t>(offset::value); }
     int64_t logical_clock() const { return read<int64_t>(offset::logical_clock); }
 
-    void swap_value_and_clock(basic_counter_shard_view& other) noexcept {
-        static constexpr size_t off = size_t(offset::value);
-        static constexpr size_t size = size_t(offset::total_size) - off;
-
-        typename View::value_type tmp[size];
-        std::copy_n(_base + off, size, tmp);
-        std::copy_n(other._base + off, size, _base + off);
-        std::copy_n(tmp, size, other._base + off);
-    }
-
-    void set_value_and_clock(const basic_counter_shard_view& other) noexcept {
-        static constexpr size_t off = size_t(offset::value);
-        static constexpr size_t size = size_t(offset::total_size) - off;
-        std::copy_n(other._base + off, size, _base + off);
-    }
-
-    bool operator==(const basic_counter_shard_view& other) const {
+    bool operator==(const counter_shard_view& other) const {
         return id() == other.id() && value() == other.value()
                && logical_clock() == other.logical_clock();
     }
-    bool operator!=(const basic_counter_shard_view& other) const {
+    bool operator!=(const counter_shard_view& other) const {
         return !(*this == other);
     }
 
     struct less_compare_by_id {
-        bool operator()(const basic_counter_shard_view& x, const basic_counter_shard_view& y) const {
+        bool operator()(const counter_shard_view& x, const counter_shard_view& y) const {
             return x.id() < y.id();
         }
     };
 };
 
-using counter_shard_view = basic_counter_shard_view<bytes_view>;
-
 std::ostream& operator<<(std::ostream& os, counter_shard_view csv);
 
 class counter_shard {
@@ -149,16 +130,12 @@ class counter_shard {
 private:
     template<typename T>
     static void write(const T& value, bytes::iterator& out) {
-        out = std::copy_n(reinterpret_cast<const signed char*>(&value), sizeof(T), out);
+        out = std::copy_n(reinterpret_cast<const char*>(&value), sizeof(T), out);
     }
 private:
     // Shared logic for applying counter_shards and counter_shard_views.
     // T is either counter_shard or basic_counter_shard_view<U>.
     template<typename T>
-    GCC6_CONCEPT(requires requires(T shard) {
-        { shard.value() } -> int64_t;
-        { shard.logical_clock() } -> int64_t;
-    })
     counter_shard& do_apply(T&& other) noexcept {
         auto other_clock = other.logical_clock();
         if (_logical_clock < other_clock) {
@@ -252,15 +229,10 @@ public:
     }
 
     atomic_cell build(api::timestamp_type timestamp) const {
-        return atomic_cell::make_live_from_serializer(timestamp, serialized_size(), [this] (bytes::iterator out) {
-            serialize(out);
-        });
-    }
-
-    static atomic_cell from_single_shard(api::timestamp_type timestamp, const counter_shard& cs) {
-        return atomic_cell::make_live_from_serializer(timestamp, counter_shard::serialized_size(), [&cs] (bytes::iterator out) {
-            cs.serialize(out);
-        });
+        bytes b(bytes::initialized_later(), serialized_size());
+        auto out = b.begin();
+        serialize(out);
+        return atomic_cell::make_live(timestamp, b);
     }
 
     class inserter_iterator : public std::iterator<std::output_iterator_tag, counter_shard> {
@@ -287,28 +259,26 @@ public:
 // <counter_id>   := <int64_t><int64_t>
 // <shard>        := <counter_id><int64_t:value><int64_t:logical_clock>
 // <counter_cell> := <shard>*
-template<typename View>
-class basic_counter_cell_view {
-protected:
-    atomic_cell_base<View> _cell;
+class counter_cell_view {
+    atomic_cell_view _cell;
 private:
-    class shard_iterator : public std::iterator<std::input_iterator_tag, basic_counter_shard_view<View>> {
-        typename View::pointer _current;
-        basic_counter_shard_view<View> _current_view;
+    class shard_iterator : public std::iterator<std::input_iterator_tag, const counter_shard_view> {
+        bytes_view::const_pointer _current;
+        counter_shard_view _current_view;
     public:
         shard_iterator() = default;
-        shard_iterator(typename View::pointer ptr) noexcept
+        shard_iterator(bytes_view::const_pointer ptr) noexcept
             : _current(ptr), _current_view(ptr) { }
 
-        basic_counter_shard_view<View>& operator*() noexcept {
+        const counter_shard_view& operator*() const noexcept {
             return _current_view;
         }
-        basic_counter_shard_view<View>* operator->() noexcept {
+        const counter_shard_view* operator->() const noexcept {
             return &_current_view;
         }
         shard_iterator& operator++() noexcept {
             _current += counter_shard_view::size;
-            _current_view = basic_counter_shard_view<View>(_current);
+            _current_view = counter_shard_view(_current);
             return *this;
         }
         shard_iterator operator++(int) noexcept {
@@ -316,16 +286,6 @@ private:
             operator++();
             return it;
         }
-        shard_iterator& operator--() noexcept {
-            _current -= counter_shard_view::size;
-            _current_view = basic_counter_shard_view<View>(_current);
-            return *this;
-        }
-        shard_iterator operator--(int) noexcept {
-            auto it = *this;
-            operator--();
-            return it;
-        }
         bool operator==(const shard_iterator& other) const noexcept {
             return _current == other._current;
         }
@@ -346,7 +306,7 @@ public:
     }
 public:
     // ac must be a live counter cell
-    explicit basic_counter_cell_view(atomic_cell_base<View> ac) noexcept : _cell(ac) {
+    explicit counter_cell_view(atomic_cell_view ac) noexcept : _cell(ac) {
         assert(_cell.is_live());
         assert(!_cell.is_counter_update());
     }
@@ -376,13 +336,9 @@ public:
         return get_shard(counter_id::local());
     }
 
-    bool operator==(const basic_counter_cell_view& other) const {
+    bool operator==(const counter_cell_view& other) const {
         return timestamp() == other.timestamp() && boost::equal(shards(), other.shards());
     }
-};
-
-struct counter_cell_view : basic_counter_cell_view<bytes_view> {
-    using basic_counter_cell_view::basic_counter_cell_view;
 
     // Returns counter shards in an order that is compatible with Scylla 1.7.4.
     std::vector<counter_shard> shards_compatible_with_1_7_4() const;
@@ -401,12 +357,6 @@ struct counter_cell_view : basic_counter_cell_view<bytes_view> {
     friend std::ostream& operator<<(std::ostream& os, counter_cell_view ccv);
 };
 
-struct counter_cell_mutable_view : basic_counter_cell_view<bytes_mutable_view> {
-    using basic_counter_cell_view::basic_counter_cell_view;
-
-    void set_timestamp(api::timestamp_type ts) { _cell.set_timestamp(ts); }
-};
-
 // Transforms mutation dst from counter updates to counter shards using state
 // stored in current_state.
 // If current_state is present it has to be in the same schema as dst.

cpu_controller.hh

@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2017 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/thread.hh>
-#include <seastar/core/timer.hh>
-#include <chrono>
-
-// Simple proportional controller to adjust shares of memtable/streaming flushes.
-//
-// Goal is to flush as fast as we can, but not so fast that we steal all the CPU from incoming
-// requests, and at the same time minimize user-visible fluctuations in the flush quota.
-//
-// What that translates to is we'll try to keep virtual dirty's firt derivative at 0 (IOW, we keep
-// virtual dirty constant), which means that the rate of incoming writes is equal to the rate of
-// flushed bytes.
-//
-// The exact point at which the controller stops determines the desired flush CPU usage. As we
-// approach the hard dirty limit, we need to be more aggressive. We will therefore define two
-// thresholds, and increase the constant as we cross them.
-//
-//  1) the soft limit line
-//  2) halfway between soft limit and dirty limit
-//
-// The constants q1 and q2 are used to determine the proportional factor at each stage.
-//
-// Below the soft limit, we are in no particular hurry to flush, since it means we're set to
-// complete flushing before we a new memtable is ready. The quota is dirty * q1, and q1 is set to a
-// low number.
-//
-// The first half of the virtual dirty region is where we expect to be usually, so we have a low
-// slope corresponding to a sluggish response between q1 * soft_limit and q2.
-//
-// In the second half, we're getting close to the hard dirty limit so we increase the slope and
-// become more responsive, up to a maximum quota of qmax.
-//
-// For now we'll just set them in the structure not to complicate the constructor. But q1, q2 and
-// qmax can easily become parameters if we find another user.
-class flush_cpu_controller {
-    static constexpr float hard_dirty_limit = 0.50;
-    static constexpr float q1 = 0.01;
-    static constexpr float q2 = 0.2;
-    static constexpr float qmax = 1;
-
-    float _current_quota = 0.0f;
-    float _goal;
-    std::function<float()> _current_dirty;
-    std::chrono::milliseconds _interval;
-    timer<> _update_timer;
-
-    seastar::thread_scheduling_group _scheduling_group;
-    seastar::thread_scheduling_group *_current_scheduling_group = nullptr;
-
-    void adjust();
-public:
-    seastar::thread_scheduling_group* scheduling_group() {
-        return _current_scheduling_group;
-    }
-    float current_quota() const {
-        return _current_quota;
-    }
-
-    struct disabled {
-        seastar::thread_scheduling_group *backup;
-    };
-    flush_cpu_controller(disabled d) : _scheduling_group(std::chrono::nanoseconds(0), 0), _current_scheduling_group(d.backup) {}
-    flush_cpu_controller(std::chrono::milliseconds interval, float soft_limit, std::function<float()> current_dirty);
-    flush_cpu_controller(flush_cpu_controller&&) = default;
-};
-
-

cql3/Cql.g

@@ -46,7 +46,6 @@ options {
 #include "cql3/statements/drop_type_statement.hh"
 #include "cql3/statements/alter_type_statement.hh"
 #include "cql3/statements/property_definitions.hh"
-#include "cql3/statements/drop_index_statement.hh"
 #include "cql3/statements/drop_table_statement.hh"
 #include "cql3/statements/drop_view_statement.hh"
 #include "cql3/statements/truncate_statement.hh"
@@ -319,7 +318,9 @@ cqlStatement returns [shared_ptr<raw::parsed_statement> stmt]
     | st10=createIndexStatement        { $stmt = st10; }
     | st11=dropKeyspaceStatement       { $stmt = st11; }
     | st12=dropTableStatement          { $stmt = st12; }
+#if 0
     | st13=dropIndexStatement          { $stmt = st13; }
+#endif
     | st14=alterTableStatement         { $stmt = st14; }
     | st15=alterKeyspaceStatement      { $stmt = st15; }
     | st16=grantStatement              { $stmt = st16; }
@@ -399,7 +400,6 @@ unaliasedSelector returns [shared_ptr<selectable::raw> s]
        | K_WRITETIME '(' c=cident ')'              { tmp = make_shared<selectable::writetime_or_ttl::raw>(c, true); }
        | K_TTL       '(' c=cident ')'              { tmp = make_shared<selectable::writetime_or_ttl::raw>(c, false); }
        | f=functionName args=selectionFunctionArgs { tmp = ::make_shared<selectable::with_function::raw>(std::move(f), std::move(args)); }
-       | K_CAST      '(' arg=unaliasedSelector K_AS t=native_type ')'  { tmp = ::make_shared<selectable::with_cast::raw>(std::move(arg), std::move(t)); }
        )
        ( '.' fi=cident { tmp = make_shared<selectable::with_field_selection::raw>(std::move(tmp), std::move(fi)); } )*
     { $s = tmp; }
@@ -778,13 +778,12 @@ createIndexStatement returns [::shared_ptr<create_index_statement> expr]
         auto props = make_shared<index_prop_defs>();
         bool if_not_exists = false;
         auto name = ::make_shared<cql3::index_name>();
-        std::vector<::shared_ptr<index_target::raw>> targets;
     }
     : K_CREATE (K_CUSTOM { props->is_custom = true; })? K_INDEX (K_IF K_NOT K_EXISTS { if_not_exists = true; } )?
-        (idxName[name])? K_ON cf=columnFamilyName '(' (target1=indexIdent { targets.emplace_back(target1); } (',' target2=indexIdent { targets.emplace_back(target2); } )*)? ')'
+        (idxName[name])? K_ON cf=columnFamilyName '(' id=indexIdent ')'
         (K_USING cls=STRING_LITERAL { props->custom_class = sstring{$cls.text}; })?
         (K_WITH properties[props])?
-      { $expr = ::make_shared<create_index_statement>(cf, name, targets, props, if_not_exists); }
+      { $expr = ::make_shared<create_index_statement>(cf, name, id, props, if_not_exists); }
     ;
 
 indexIdent returns [::shared_ptr<index_target::raw> id]
@@ -958,14 +957,16 @@ dropViewStatement returns [::shared_ptr<drop_view_statement> stmt]
       { $stmt = ::make_shared<drop_view_statement>(cf, if_exists); }
     ;
 
+#if 0
 /**
  * DROP INDEX [IF EXISTS] <INDEX_NAME>
  */
-dropIndexStatement returns [::shared_ptr<drop_index_statement> expr]
-    @init { bool if_exists = false; }
-    : K_DROP K_INDEX (K_IF K_EXISTS { if_exists = true; } )? index=indexName
-      { $expr = ::make_shared<drop_index_statement>(index, if_exists); }
+dropIndexStatement returns [DropIndexStatement expr]
+    @init { boolean ifExists = false; }
+    : K_DROP K_INDEX (K_IF K_EXISTS { ifExists = true; } )? index=indexName
+      { $expr = new DropIndexStatement(index, ifExists); }
     ;
+#endif
 
 /**
   * TRUNCATE <CF>;
@@ -1168,7 +1169,6 @@ constant returns [shared_ptr<cql3::constants::literal> constant]
     | t=INTEGER        { $constant = cql3::constants::literal::integer(sstring{$t.text}); }
     | t=FLOAT          { $constant = cql3::constants::literal::floating_point(sstring{$t.text}); }
     | t=BOOLEAN        { $constant = cql3::constants::literal::bool_(sstring{$t.text}); }
-    | t=DURATION       { $constant = cql3::constants::literal::duration(sstring{$t.text}); }
     | t=UUID           { $constant = cql3::constants::literal::uuid(sstring{$t.text}); }
     | t=HEXNUMBER      { $constant = cql3::constants::literal::hex(sstring{$t.text}); }
     | { sign=""; } ('-' {sign = "-"; } )? t=(K_NAN | K_INFINITY) { $constant = cql3::constants::literal::floating_point(sstring{sign + $t.text}); }
@@ -1303,10 +1303,6 @@ normalColumnOperation[operations_type& operations, ::shared_ptr<cql3::column_ide
           }
           add_raw_update(operations, key, make_shared<cql3::operation::addition>(cql3::constants::literal::integer($i.text)));
       }
-    | K_SCYLLA_COUNTER_SHARD_LIST '(' t=term ')'
-      {
-          add_raw_update(operations, key, ::make_shared<cql3::operation::set_counter_value_from_tuple_list>(t));      
-      }
     ;
 
 specializedColumnOperation[std::vector<std::pair<shared_ptr<cql3::column_identifier::raw>,
@@ -1466,7 +1462,6 @@ native_type returns [shared_ptr<cql3_type> t]
     | K_COUNTER   { $t = cql3_type::counter; }
     | K_DECIMAL   { $t = cql3_type::decimal; }
     | K_DOUBLE    { $t = cql3_type::double_; }
-    | K_DURATION  { $t = cql3_type::duration; }
     | K_FLOAT     { $t = cql3_type::float_; }
     | K_INET      { $t = cql3_type::inet; }
     | K_INT       { $t = cql3_type::int_; }
@@ -1572,7 +1567,6 @@ basic_unreserved_keyword returns [sstring str]
 K_SELECT:      S E L E C T;
 K_FROM:        F R O M;
 K_AS:          A S;
-K_CAST:        C A S T;
 K_WHERE:       W H E R E;
 K_AND:         A N D;
 K_KEY:         K E Y;
@@ -1653,7 +1647,6 @@ K_BOOLEAN:     B O O L E A N;
 K_COUNTER:     C O U N T E R;
 K_DECIMAL:     D E C I M A L;
 K_DOUBLE:      D O U B L E;
-K_DURATION:    D U R A T I O N;
 K_FLOAT:       F L O A T;
 K_INET:        I N E T;
 K_INT:         I N T;
@@ -1697,7 +1690,6 @@ 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;
-K_SCYLLA_COUNTER_SHARD_LIST: S C Y L L A '_' C O U N T E R '_' S H A R D '_' L I S T; 
 
 // Case-insensitive alpha characters
 fragment A: ('a'|'A');
@@ -1783,20 +1775,6 @@ fragment EXPONENT
     : E ('+' | '-')? DIGIT+
     ;
 
-fragment DURATION_UNIT
-    : Y
-    | M O
-    | W
-    | D
-    | H
-    | M
-    | S
-    | M S
-    | U S
-    | '\u00B5' S
-    | N S
-    ;
-
 INTEGER
     : '-'? DIGIT+
     ;
@@ -1821,13 +1799,6 @@ BOOLEAN
     : T R U E | F A L S E
     ;
 
-DURATION
-    : '-'? DIGIT+ DURATION_UNIT (DIGIT+ DURATION_UNIT)*
-    | '-'? 'P' (DIGIT+ 'Y')? (DIGIT+ 'M')? (DIGIT+ 'D')? ('T' (DIGIT+ 'H')? (DIGIT+ 'M')? (DIGIT+ 'S')?)? // ISO 8601 "format with designators"
-    | '-'? 'P' DIGIT+ 'W'
-    | '-'? 'P' DIGIT DIGIT DIGIT DIGIT '-' DIGIT DIGIT '-' DIGIT DIGIT 'T' DIGIT DIGIT ':' DIGIT DIGIT ':' DIGIT DIGIT // ISO 8601 "alternative format"
-    ;
-
 IDENT
     : LETTER (LETTER | DIGIT | '_')*
     ;

cql3/abstract_marker.cc

@@ -79,7 +79,6 @@ abstract_marker::raw::raw(int32_t bind_index)
         return ::make_shared<maps::marker>(_bind_index, receiver);
     }
     assert(0);
-    return shared_ptr<term>();
 }
 
 assignment_testable::test_result abstract_marker::raw::test_assignment(database& db, const sstring& keyspace, ::shared_ptr<column_specification> receiver) {

cql3/attributes.cc

@@ -79,7 +79,7 @@ int64_t attributes::get_timestamp(int64_t now, const query_options& options) {
     }
     try {
         data_type_for<int64_t>()->validate(*tval);
-    } catch (marshal_exception& e) {
+    } catch (marshal_exception e) {
         throw exceptions::invalid_request_exception("Invalid timestamp value");
     }
     return value_cast<int64_t>(data_type_for<int64_t>()->deserialize(*tval));
@@ -99,7 +99,7 @@ int32_t attributes::get_time_to_live(const query_options& options) {
     try {
         data_type_for<int32_t>()->validate(*tval);
     }
-    catch (marshal_exception& e) {
+    catch (marshal_exception e) {
         throw exceptions::invalid_request_exception("Invalid TTL value");
     }
 

cql3/column_condition.cc

@@ -40,29 +40,11 @@
  */
 
 #include "cql3/column_condition.hh"
-#include "statements/request_validations.hh"
 #include "unimplemented.hh"
 #include "lists.hh"
 #include "maps.hh"
 #include <boost/range/algorithm_ext/push_back.hpp>
 
-namespace {
-
-void validate_operation_on_durations(const abstract_type& type, const cql3::operator_type& op) {
-    using cql3::statements::request_validations::check_false;
-
-    if (op.is_slice() && type.references_duration()) {
-        check_false(type.is_collection(), "Slice conditions are not supported on collections containing durations");
-        check_false(type.is_tuple(), "Slice conditions are not supported on tuples containing durations");
-        check_false(type.is_user_type(), "Slice conditions are not supported on UDTs containing durations");
-
-        // We're a duration.
-        throw exceptions::invalid_request_exception(sprint("Slice conditions are not supported on durations"));
-    }
-}
-
-}
-
 namespace cql3 {
 
 bool
@@ -113,7 +95,6 @@ column_condition::raw::prepare(database& db, const sstring& keyspace, const colu
             }
             return column_condition::in_condition(receiver, std::move(terms));
         } else {
-            validate_operation_on_durations(*receiver.type, _op);
             return column_condition::condition(receiver, _value->prepare(db, keyspace, receiver.column_specification), _op);
         }
     }
@@ -148,8 +129,6 @@ column_condition::raw::prepare(database& db, const sstring& keyspace, const colu
                                 | boost::adaptors::transformed(std::bind(&term::raw::prepare, std::placeholders::_1, std::ref(db), std::ref(keyspace), value_spec)));
         return column_condition::in_condition(receiver, _collection_element->prepare(db, keyspace, element_spec), terms);
     } else {
-        validate_operation_on_durations(*receiver.type, _op);
-
         return column_condition::condition(receiver,
                 _collection_element->prepare(db, keyspace, element_spec),
                 _value->prepare(db, keyspace, value_spec),

cql3/column_identifier.cc

@@ -23,8 +23,6 @@
 #include "exceptions/exceptions.hh"
 #include "cql3/selection/simple_selector.hh"
 
-#include <regex>
-
 namespace cql3 {
 
 column_identifier::column_identifier(sstring raw_text, bool keep_case) {
@@ -61,17 +59,6 @@ sstring column_identifier::to_string() const {
     return _text;
 }
 
-sstring column_identifier::to_cql_string() const {
-    static const std::regex unquoted_identifier_re("[a-z][a-z0-9_]*");
-    if (std::regex_match(_text.begin(), _text.end(), unquoted_identifier_re)) {
-        return _text;
-    }
-    static const std::regex double_quote_re("\"");
-    std::string result = _text;
-    std::regex_replace(result, double_quote_re, "\"\"");
-    return '"' + result + '"';
-}
-
 column_identifier::raw::raw(sstring raw_text, bool keep_case)
     : _raw_text{raw_text}
     , _text{raw_text}

cql3/column_identifier.hh

@@ -80,8 +80,6 @@ public:
 
     sstring to_string() const;
 
-    sstring to_cql_string() const;
-
     friend std::ostream& operator<<(std::ostream& out, const column_identifier& i) {
         return out << i._text;
     }

cql3/constants.cc

@@ -52,15 +52,14 @@ std::ostream&
 operator<<(std::ostream&out, constants::type t)
 {
     switch (t) {
-        case constants::type::STRING:   return out << "STRING";
-        case constants::type::INTEGER:  return out << "INTEGER";
-        case constants::type::UUID:     return out << "UUID";
-        case constants::type::FLOAT:    return out << "FLOAT";
-        case constants::type::BOOLEAN:  return out << "BOOLEAN";
-        case constants::type::HEX:      return out << "HEX";
-        case constants::type::DURATION: return out << "DURATION";
-    }
-    abort();
+        case constants::type::STRING:  return out << "STRING";
+        case constants::type::INTEGER: return out << "INTEGER";
+        case constants::type::UUID:    return out << "UUID";
+        case constants::type::FLOAT:   return out << "FLOAT";
+        case constants::type::BOOLEAN: return out << "BOOLEAN";
+        case constants::type::HEX:     return out << "HEX";
+    };
+    assert(0);
 }
 
 bytes
@@ -146,11 +145,6 @@ constants::literal::test_assignment(database& db, const sstring& keyspace, ::sha
                 return assignment_testable::test_result::WEAKLY_ASSIGNABLE;
             }
             break;
-        case type::DURATION:
-            if (kind == cql3_type::kind_enum_set::prepare<cql3_type::kind::DURATION>()) {
-                return assignment_testable::test_result::EXACT_MATCH;
-            }
-            break;
     }
     return assignment_testable::test_result::NOT_ASSIGNABLE;
 }
@@ -165,7 +159,7 @@ constants::literal::prepare(database& db, const sstring& keyspace, ::shared_ptr<
     return ::make_shared<value>(cql3::raw_value::make_value(parsed_value(receiver->type)));
 }
 
-void constants::deleter::execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) {
+void constants::deleter::execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) {
     if (column.type->is_multi_cell()) {
         collection_type_impl::mutation coll_m;
         coll_m.tomb = params.make_tombstone();

cql3/constants.hh

@@ -60,7 +60,7 @@ public:
 #endif
 public:
     enum class type {
-        STRING, INTEGER, UUID, FLOAT, BOOLEAN, HEX, DURATION
+        STRING, INTEGER, UUID, FLOAT, BOOLEAN, HEX
     };
 
     /**
@@ -149,10 +149,6 @@ public:
             return ::make_shared<literal>(type::HEX, text);
         }
 
-        static ::shared_ptr<literal> duration(sstring text) {
-            return ::make_shared<literal>(type::DURATION, text);
-        }
-
         virtual ::shared_ptr<term> prepare(database& db, const sstring& keyspace, ::shared_ptr<column_specification> receiver);
     private:
         bytes parsed_value(data_type validator);
@@ -201,7 +197,7 @@ public:
     public:
         using operation::operation;
 
-        virtual void execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) override {
+        virtual void execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) override {
             auto value = _t->bind_and_get(params._options);
             if (value.is_null()) {
                 m.set_cell(prefix, column, std::move(make_dead_cell(params)));
@@ -214,7 +210,7 @@ public:
     struct adder final : operation {
         using operation::operation;
 
-        virtual void execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) override {
+        virtual void execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) override {
             auto value = _t->bind_and_get(params._options);
             if (value.is_null()) {
                 throw exceptions::invalid_request_exception("Invalid null value for counter increment");
@@ -229,7 +225,7 @@ public:
     struct subtracter final : operation {
         using operation::operation;
 
-        virtual void execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) override {
+        virtual void execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) override {
             auto value = _t->bind_and_get(params._options);
             if (value.is_null()) {
                 throw exceptions::invalid_request_exception("Invalid null value for counter increment");
@@ -250,7 +246,7 @@ public:
             : operation(column, {})
         { }
 
-        virtual void execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) override;
+        virtual void execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) override;
     };
 };
 

cql3/cql3_type.cc

@@ -19,43 +19,11 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <iostream>
-#include <iterator>
-#include <regex>
-
 #include "cql3_type.hh"
-#include "cql3/util.hh"
 #include "ut_name.hh"
 
 namespace cql3 {
 
-sstring cql3_type::to_string() const {
-    if (_type->is_user_type()) {
-        return "frozen<" + util::maybe_quote(_name) + ">";
-    }
-    if (_type->is_tuple()) {
-        return "frozen<" + _name + ">";
-    }
-    return _name;
-}
-
-shared_ptr<cql3_type> cql3_type::raw::prepare(database& db, const sstring& keyspace) {
-    try {
-        auto&& ks = db.find_keyspace(keyspace);
-        return prepare_internal(keyspace, ks.metadata()->user_types());
-    } catch (no_such_keyspace& nsk) {
-        throw exceptions::invalid_request_exception("Unknown keyspace " + keyspace);
-    }
-}
-
-bool cql3_type::raw::is_duration() const {
-    return false;
-}
-
-bool cql3_type::raw::references_user_type(const sstring& name) const {
-    return false;
-}
-
 class cql3_type::raw_type : public raw {
 private:
     shared_ptr<cql3_type> _type;
@@ -67,9 +35,6 @@ public:
     virtual shared_ptr<cql3_type> prepare(database& db, const sstring& keyspace) {
         return _type;
     }
-    shared_ptr<cql3_type> prepare_internal(const sstring&, lw_shared_ptr<user_types_metadata>) override {
-        return _type;
-    }
 
     virtual bool supports_freezing() const {
         return false;
@@ -82,10 +47,6 @@ public:
     virtual sstring to_string() const {
         return _type->to_string();
     }
-
-    virtual bool is_duration() const override {
-        return _type->get_type()->equals(duration_type);
-    }
 };
 
 class cql3_type::raw_collection : public raw {
@@ -115,7 +76,7 @@ public:
         return true;
     }
 
-    virtual shared_ptr<cql3_type> prepare_internal(const sstring& keyspace, lw_shared_ptr<user_types_metadata> user_types) override {
+    virtual shared_ptr<cql3_type> prepare(database& db, const sstring& keyspace) override {
         assert(_values); // "Got null values type for a collection";
 
         if (!_frozen && _values->supports_freezing() && !_values->_frozen) {
@@ -132,30 +93,16 @@ public:
         }
 
         if (_kind == &collection_type_impl::kind::list) {
-            return make_shared(cql3_type(to_string(), list_type_impl::get_instance(_values->prepare_internal(keyspace, user_types)->get_type(), !_frozen), false));
+            return make_shared(cql3_type(to_string(), list_type_impl::get_instance(_values->prepare(db, keyspace)->get_type(), !_frozen), false));
         } else if (_kind == &collection_type_impl::kind::set) {
-            if (_values->is_duration()) {
-                throw exceptions::invalid_request_exception(sprint("Durations are not allowed inside sets: %s", *this));
-            }
-            return make_shared(cql3_type(to_string(), set_type_impl::get_instance(_values->prepare_internal(keyspace, user_types)->get_type(), !_frozen), false));
+            return make_shared(cql3_type(to_string(), set_type_impl::get_instance(_values->prepare(db, keyspace)->get_type(), !_frozen), false));
         } else if (_kind == &collection_type_impl::kind::map) {
             assert(_keys); // "Got null keys type for a collection";
-            if (_keys->is_duration()) {
-                throw exceptions::invalid_request_exception(sprint("Durations are not allowed as map keys: %s", *this));
-            }
-            return make_shared(cql3_type(to_string(), map_type_impl::get_instance(_keys->prepare_internal(keyspace, user_types)->get_type(), _values->prepare_internal(keyspace, user_types)->get_type(), !_frozen), false));
+            return make_shared(cql3_type(to_string(), map_type_impl::get_instance(_keys->prepare(db, keyspace)->get_type(), _values->prepare(db, keyspace)->get_type(), !_frozen), false));
         }
         abort();
     }
 
-    bool references_user_type(const sstring& name) const override {
-        return (_keys && _keys->references_user_type(name)) || _values->references_user_type(name);
-    }
-
-    bool is_duration() const override {
-        return false;
-    }
-
     virtual sstring to_string() const override {
         sstring start = _frozen ? "frozen<" : "";
         sstring end = _frozen ? ">" : "";
@@ -185,7 +132,7 @@ public:
         _frozen = true;
     }
 
-    virtual shared_ptr<cql3_type> prepare_internal(const sstring& keyspace, lw_shared_ptr<user_types_metadata> user_types) override {
+    virtual shared_ptr<cql3_type> prepare(database& db, const sstring& keyspace) override {
         if (_name.has_keyspace()) {
             // The provided keyspace is the one of the current statement this is part of. If it's different from the keyspace of
             // the UTName, we reject since we want to limit user types to their own keyspace (see #6643)
@@ -197,23 +144,23 @@ public:
         } else {
             _name.set_keyspace(keyspace);
         }
-        if (!user_types) {
-            // bootstrap mode.
-            throw exceptions::invalid_request_exception(sprint("Unknown type %s", _name));
-        }
+
         try {
-            auto&& type = 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<>");
+            auto&& ks = db.find_keyspace(_name.get_keyspace());
+            try {
+                auto&& type = ks.metadata()->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<>");
+                }
+                return make_shared<cql3_type>(_name.to_string(), std::move(type));
+            } catch (std::out_of_range& e) {
+                throw exceptions::invalid_request_exception(sprint("Unknown type %s", _name));
             }
-            return make_shared<cql3_type>(_name.to_string(), std::move(type));
-        } catch (std::out_of_range& e) {
-            throw exceptions::invalid_request_exception(sprint("Unknown type %s", _name));
+        } catch (no_such_keyspace& nsk) {
+            throw exceptions::invalid_request_exception("Unknown keyspace " + _name.get_keyspace());
         }
     }
-    bool references_user_type(const sstring& name) const override {
-        return _name.get_string_type_name() == name;
-    }
+
     virtual bool supports_freezing() const override {
         return true;
     }
@@ -244,7 +191,7 @@ public:
         }
         _frozen = true;
     }
-    virtual shared_ptr<cql3_type> prepare_internal(const sstring& keyspace, lw_shared_ptr<user_types_metadata> user_types) override {
+    virtual shared_ptr<cql3_type> prepare(database& db, const sstring& keyspace) override {
         if (!_frozen) {
             freeze();
         }
@@ -253,17 +200,10 @@ public:
             if (t->is_counter()) {
                 throw exceptions::invalid_request_exception("Counters are not allowed inside tuples");
             }
-            ts.push_back(t->prepare_internal(keyspace, user_types)->get_type());
+            ts.push_back(t->prepare(db, keyspace)->get_type());
         }
         return make_cql3_tuple_type(tuple_type_impl::get_instance(std::move(ts)));
     }
-
-    bool references_user_type(const sstring& name) const override {
-        return std::any_of(_types.begin(), _types.end(), [&name](auto t) {
-            return t->references_user_type(name);
-        });
-    }
-
     virtual sstring to_string() const override {
         return sprint("tuple<%s>", join(", ", _types));
     }
@@ -331,7 +271,6 @@ thread_local shared_ptr<cql3_type> cql3_type::bigint = make("bigint", long_type,
 thread_local shared_ptr<cql3_type> cql3_type::blob = make("blob", bytes_type, cql3_type::kind::BLOB);
 thread_local shared_ptr<cql3_type> cql3_type::boolean = make("boolean", boolean_type, cql3_type::kind::BOOLEAN);
 thread_local shared_ptr<cql3_type> cql3_type::double_ = make("double", double_type, cql3_type::kind::DOUBLE);
-thread_local shared_ptr<cql3_type> cql3_type::empty = make("empty", empty_type, cql3_type::kind::EMPTY);
 thread_local shared_ptr<cql3_type> cql3_type::float_ = make("float", float_type, cql3_type::kind::FLOAT);
 thread_local shared_ptr<cql3_type> cql3_type::int_ = make("int", int32_type, cql3_type::kind::INT);
 thread_local shared_ptr<cql3_type> cql3_type::smallint = make("smallint", short_type, cql3_type::kind::SMALLINT);
@@ -347,7 +286,6 @@ thread_local shared_ptr<cql3_type> cql3_type::inet = make("inet", inet_addr_type
 thread_local shared_ptr<cql3_type> cql3_type::varint = make("varint", varint_type, cql3_type::kind::VARINT);
 thread_local shared_ptr<cql3_type> cql3_type::decimal = make("decimal", decimal_type, cql3_type::kind::DECIMAL);
 thread_local shared_ptr<cql3_type> cql3_type::counter = make("counter", counter_type, cql3_type::kind::COUNTER);
-thread_local shared_ptr<cql3_type> cql3_type::duration = make("duration", duration_type, cql3_type::kind::DURATION);
 
 const std::vector<shared_ptr<cql3_type>>&
 cql3_type::values() {
@@ -359,9 +297,8 @@ cql3_type::values() {
         cql3_type::counter,
         cql3_type::decimal,
         cql3_type::double_,
-        cql3_type::empty,
         cql3_type::float_,
-        cql3_type::inet,
+        cql3_type:inet,
         cql3_type::int_,
         cql3_type::smallint,
         cql3_type::text,
@@ -373,7 +310,6 @@ cql3_type::values() {
         cql3_type::timeuuid,
         cql3_type::date,
         cql3_type::time,
-        cql3_type::duration,
     };
     return v;
 }
@@ -393,23 +329,5 @@ operator<<(std::ostream& os, const cql3_type::raw& r) {
     return os << r.to_string();
 }
 
-namespace util {
-
-sstring maybe_quote(const sstring& s) {
-    static const std::regex unquoted("\\w*");
-    static const std::regex double_quote("\"");
-
-    if (std::regex_match(s.begin(), s.end(), unquoted)) {
-        return s;
-    }
-    std::ostringstream ss;
-    ss << "\"";
-    std::regex_replace(std::ostreambuf_iterator<char>(ss), s.begin(), s.end(), double_quote, "\"\"");
-    ss << "\"";
-    return ss.str();
-}
-
-}
-
 }
 

cql3/cql3_type.hh

@@ -47,7 +47,6 @@
 #include "enum_set.hh"
 
 class database;
-class user_types_metadata;
 
 namespace cql3 {
 
@@ -64,23 +63,19 @@ public:
     bool is_counter() const { return _type->is_counter(); }
     bool is_native() const { return _native; }
     data_type get_type() const { return _type; }
-    sstring to_string() const;
+    sstring to_string() const { return _name; }
 
     // For UserTypes, we need to know the current keyspace to resolve the
     // actual type used, so Raw is a "not yet prepared" CQL3Type.
     class raw {
     public:
-        virtual ~raw() {}
         bool _frozen = false;
         virtual bool supports_freezing() const = 0;
         virtual bool is_collection() const;
         virtual bool is_counter() const;
-        virtual bool is_duration() const;
-        virtual bool references_user_type(const sstring&) const;
         virtual std::experimental::optional<sstring> keyspace() const;
         virtual void freeze();
-        virtual shared_ptr<cql3_type> prepare_internal(const sstring& keyspace, lw_shared_ptr<user_types_metadata>) = 0;
-        virtual shared_ptr<cql3_type> prepare(database& db, const sstring& keyspace);
+        virtual shared_ptr<cql3_type> prepare(database& db, const sstring& keyspace) = 0;
         static shared_ptr<raw> from(shared_ptr<cql3_type> type);
         static shared_ptr<raw> user_type(ut_name name);
         static shared_ptr<raw> map(shared_ptr<raw> t1, shared_ptr<raw> t2);
@@ -103,7 +98,7 @@ private:
 
 public:
     enum class kind : int8_t {
-        ASCII, BIGINT, BLOB, BOOLEAN, COUNTER, DECIMAL, DOUBLE, EMPTY, FLOAT, INT, SMALLINT, TINYINT, INET, TEXT, TIMESTAMP, UUID, VARCHAR, VARINT, TIMEUUID, DATE, TIME, DURATION
+        ASCII, BIGINT, BLOB, BOOLEAN, COUNTER, DECIMAL, DOUBLE, FLOAT, INT, SMALLINT, TINYINT, INET, TEXT, TIMESTAMP, UUID, VARCHAR, VARINT, TIMEUUID, DATE, TIME
     };
     using kind_enum = super_enum<kind,
         kind::ASCII,
@@ -113,7 +108,6 @@ public:
         kind::COUNTER,
         kind::DECIMAL,
         kind::DOUBLE,
-        kind::EMPTY,
         kind::FLOAT,
         kind::INET,
         kind::INT,
@@ -126,8 +120,7 @@ public:
         kind::VARINT,
         kind::TIMEUUID,
         kind::DATE,
-        kind::TIME,
-        kind::DURATION>;
+        kind::TIME>;
     using kind_enum_set = enum_set<kind_enum>;
 private:
     std::experimental::optional<kind_enum_set::prepared> _kind;
@@ -140,7 +133,6 @@ public:
     static thread_local shared_ptr<cql3_type> blob;
     static thread_local shared_ptr<cql3_type> boolean;
     static thread_local shared_ptr<cql3_type> double_;
-    static thread_local shared_ptr<cql3_type> empty;
     static thread_local shared_ptr<cql3_type> float_;
     static thread_local shared_ptr<cql3_type> int_;
     static thread_local shared_ptr<cql3_type> smallint;
@@ -156,7 +148,6 @@ public:
     static thread_local shared_ptr<cql3_type> varint;
     static thread_local shared_ptr<cql3_type> decimal;
     static thread_local shared_ptr<cql3_type> counter;
-    static thread_local shared_ptr<cql3_type> duration;
 
     static const std::vector<shared_ptr<cql3_type>>& values();
 public:

cql3/cql_statement.hh

@@ -46,7 +46,7 @@
 #include "service/storage_proxy.hh"
 #include "cql3/query_options.hh"
 
-namespace cql_transport {
+namespace transport {
 
 namespace messages {
 
@@ -89,7 +89,7 @@ public:
      * @param state the current query state
      * @param options options for this query (consistency, variables, pageSize, ...)
      */
-    virtual future<::shared_ptr<cql_transport::messages::result_message>>
+    virtual future<::shared_ptr<transport::messages::result_message>>
         execute(distributed<service::storage_proxy>& proxy, service::query_state& state, const query_options& options) = 0;
 
     /**
@@ -97,7 +97,7 @@ public:
      *
      * @param state the current query state
      */
-    virtual future<::shared_ptr<cql_transport::messages::result_message>>
+    virtual future<::shared_ptr<transport::messages::result_message>>
         execute_internal(distributed<service::storage_proxy>& proxy, service::query_state& state, const query_options& options) = 0;
 
     virtual bool uses_function(const sstring& ks_name, const sstring& function_name) const = 0;

cql3/error_collector.hh

@@ -67,6 +67,10 @@ class error_collector : public error_listener<RecognizerType, ExceptionBaseType>
      */
     const sstring_view _query;
 
+    /**
+     * The error messages.
+     */
+    std::vector<sstring> _error_msgs;
 public:
 
     /**
@@ -77,10 +81,7 @@ public:
      */
     error_collector(const sstring_view& query) : _query(query) {}
 
-    /**
-     * Format and throw a new \c exceptions::syntax_exception.
-     */
-    [[noreturn]] virtual void syntax_error(RecognizerType& recognizer, ANTLR_UINT8** token_names, ExceptionBaseType* ex) override {
+    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;
@@ -89,15 +90,22 @@ public:
         if (recognizer instanceof Parser)
             appendQuerySnippet((Parser) recognizer, builder);
 #endif
+        _error_msgs.emplace_back(result.str());
+    }
 
-        throw exceptions::syntax_exception(result.str());
+    virtual void syntax_error(RecognizerType& recognizer, const sstring& msg) override {
+        _error_msgs.emplace_back(msg);
     }
 
     /**
-     * Throw a new \c exceptions::syntax_exception.
+     * Throws the first syntax error found by the lexer or the parser if it exists.
+     *
+     * @throws SyntaxException the syntax error.
      */
-    [[noreturn]] virtual void syntax_error(RecognizerType&, const sstring& msg) override {
-        throw exceptions::syntax_exception(msg);
+    void throw_first_syntax_error() {
+        if (!_error_msgs.empty()) {
+            throw exceptions::syntax_exception(_error_msgs[0]);
+        }
     }
 
 private:

cql3/error_listener.hh

@@ -41,7 +41,6 @@
 
 #pragma once
 
-#include "seastarx.hh"
 #include <seastar/core/sstring.hh>
 #include <antlr3.hpp>
 
@@ -53,7 +52,6 @@ namespace cql3 {
 template<typename RecognizerType, typename ExceptionBaseType>
 class error_listener {
 public:
-    virtual ~error_listener() = default;
 
     /**
      * Invoked when a syntax error occurs.

cql3/functions/aggregate_fcts.hh

@@ -41,7 +41,6 @@
 
 #pragma once
 
-#include "utils/big_decimal.hh"
 #include "aggregate_function.hh"
 #include "native_aggregate_function.hh"
 
@@ -112,70 +111,9 @@ make_sum_function() {
     return make_shared<sum_function_for<Type>>();
 }
 
-template <typename Type>
-class impl_div_for_avg {
-public:
-    static Type div(const Type& x, const int64_t y) {
-        return x/y;
-    }
-};
-
-template <>
-class impl_div_for_avg<big_decimal> {
-public:
-    static big_decimal div(const big_decimal& x, const int64_t y) {
-        return x.div(y, big_decimal::rounding_mode::HALF_EVEN);
-    }
-};
-
-// We need a wider accumulator for average, since summing the inputs can overflow
-// the input type
-template <typename T>
-struct accumulator_for;
-
-template <>
-struct accumulator_for<int8_t> {
-    using type = __int128;
-};
-
-template <>
-struct accumulator_for<int16_t> {
-    using type = __int128;
-};
-
-template <>
-struct accumulator_for<int32_t> {
-    using type = __int128;
-};
-
-template <>
-struct accumulator_for<int64_t> {
-    using type = __int128;
-};
-
-template <>
-struct accumulator_for<float> {
-    using type = float;
-};
-
-template <>
-struct accumulator_for<double> {
-    using type = double;
-};
-
-template <>
-struct accumulator_for<boost::multiprecision::cpp_int> {
-    using type = boost::multiprecision::cpp_int;
-};
-
-template <>
-struct accumulator_for<big_decimal> {
-    using type = big_decimal;
-};
-
 template <typename Type>
 class impl_avg_function_for final : public aggregate_function::aggregate {
-   typename accumulator_for<Type>::type _sum{};
+   Type _sum{};
    int64_t _count = 0;
 public:
     virtual void reset() override {
@@ -183,9 +121,9 @@ public:
         _count = 0;
     }
     virtual opt_bytes compute(cql_serialization_format sf) override {
-        Type ret{};
+        Type ret = 0;
         if (_count) {
-            ret = impl_div_for_avg<Type>::div(_sum, _count);
+            ret = _sum / _count;
         }
         return data_type_for<Type>()->decompose(ret);
     }

cql3/functions/castas_fcts.cc

@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2017 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 "castas_fcts.hh"
-#include "cql3/functions/native_scalar_function.hh"
-
-namespace cql3 {
-namespace functions {
-
-namespace {
-
-using bytes_opt = std::experimental::optional<bytes>;
-
-class castas_function_for : public cql3::functions::native_scalar_function {
-    castas_fctn _func;
-public:
-    castas_function_for(data_type to_type,
-                        data_type from_type,
-                        castas_fctn func)
-            : native_scalar_function("castas" + to_type->as_cql3_type()->to_string(), to_type, {from_type})
-            , _func(func) {
-    }
-    virtual bool is_pure() override {
-        return true;
-    }
-    virtual void print(std::ostream& os) const override {
-        os << "cast(" << _arg_types[0]->name() << " as " << _return_type->name() << ")";
-    }
-    virtual bytes_opt execute(cql_serialization_format sf, const std::vector<bytes_opt>& parameters) override {
-        auto from_type = arg_types()[0];
-        auto to_type = return_type();
-
-        auto&& val = parameters[0];
-        if (!val) {
-            return val;
-        }
-        auto val_from = from_type->deserialize(*val);
-        auto val_to = _func(val_from);
-        return to_type->decompose(val_to);
-    }
-};
-
-shared_ptr<function> make_castas_function(data_type to_type, data_type from_type, castas_fctn func) {
-    return ::make_shared<castas_function_for>(std::move(to_type), std::move(from_type), std::move(func));
-}
-
-} /* Anonymous Namespace */
-
-shared_ptr<function> castas_functions::get(data_type to_type, const std::vector<shared_ptr<cql3::selection::selector>>& provided_args, schema_ptr s) {
-    if (provided_args.size() != 1) {
-        throw exceptions::invalid_request_exception("Invalid CAST expression");
-    }
-    auto from_type = provided_args[0]->get_type();
-    auto from_type_key = from_type;
-    if (from_type_key->is_reversed()) {
-        from_type_key = dynamic_cast<const reversed_type_impl&>(*from_type).underlying_type();
-    }
-
-    auto f = get_castas_fctn(to_type, from_type_key);
-    return make_castas_function(to_type, from_type, f);
-}
-
-}
-}

cql3/functions/castas_fcts.hh

@@ -1,63 +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.
- */
-
-/*
- * Modified by ScyllaDB
- *
- * Copyright (C) 2017 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 <tuple>
-#include <unordered_map>
-
-#include "cql3/functions/function.hh"
-#include "cql3/functions/abstract_function.hh"
-#include "exceptions/exceptions.hh"
-#include "core/print.hh"
-#include "cql3/cql3_type.hh"
-#include "cql3/selection/selector.hh"
-
-namespace cql3 {
-namespace functions {
-
-class castas_functions {
-public:
-    static shared_ptr<function> get(data_type to_type, const std::vector<shared_ptr<cql3::selection::selector>>& provided_args, schema_ptr s);
-};
-
-}
-}

cql3/functions/functions.cc

@@ -59,14 +59,6 @@ functions::init() {
         declare(make_to_blob_function(type->get_type()));
         declare(make_from_blob_function(type->get_type()));
     }
-    declare(aggregate_fcts::make_count_function<int8_t>());
-    declare(aggregate_fcts::make_max_function<int8_t>());
-    declare(aggregate_fcts::make_min_function<int8_t>());
-
-    declare(aggregate_fcts::make_count_function<int16_t>());
-    declare(aggregate_fcts::make_max_function<int16_t>());
-    declare(aggregate_fcts::make_min_function<int16_t>());
-
     declare(aggregate_fcts::make_count_function<int32_t>());
     declare(aggregate_fcts::make_max_function<int32_t>());
     declare(aggregate_fcts::make_min_function<int32_t>());
@@ -75,14 +67,6 @@ functions::init() {
     declare(aggregate_fcts::make_max_function<int64_t>());
     declare(aggregate_fcts::make_min_function<int64_t>());
 
-    declare(aggregate_fcts::make_count_function<boost::multiprecision::cpp_int>());
-    declare(aggregate_fcts::make_max_function<boost::multiprecision::cpp_int>());
-    declare(aggregate_fcts::make_min_function<boost::multiprecision::cpp_int>());
-
-    declare(aggregate_fcts::make_count_function<big_decimal>());
-    declare(aggregate_fcts::make_max_function<big_decimal>());
-    declare(aggregate_fcts::make_min_function<big_decimal>());
-
     declare(aggregate_fcts::make_count_function<float>());
     declare(aggregate_fcts::make_max_function<float>());
     declare(aggregate_fcts::make_min_function<float>());
@@ -91,10 +75,6 @@ functions::init() {
     declare(aggregate_fcts::make_max_function<double>());
     declare(aggregate_fcts::make_min_function<double>());
 
-    declare(aggregate_fcts::make_count_function<sstring>());
-    declare(aggregate_fcts::make_max_function<sstring>());
-    declare(aggregate_fcts::make_min_function<sstring>());
-
     //FIXME:
     //declare(aggregate_fcts::make_count_function<bytes>());
     //declare(aggregate_fcts::make_max_function<bytes>());
@@ -104,22 +84,22 @@ functions::init() {
 
     declare(make_varchar_as_blob_fct());
     declare(make_blob_as_varchar_fct());
-    declare(aggregate_fcts::make_sum_function<int8_t>());
-    declare(aggregate_fcts::make_sum_function<int16_t>());
     declare(aggregate_fcts::make_sum_function<int32_t>());
     declare(aggregate_fcts::make_sum_function<int64_t>());
     declare(aggregate_fcts::make_sum_function<float>());
     declare(aggregate_fcts::make_sum_function<double>());
-    declare(aggregate_fcts::make_sum_function<boost::multiprecision::cpp_int>());
-    declare(aggregate_fcts::make_sum_function<big_decimal>());
-    declare(aggregate_fcts::make_avg_function<int8_t>());
-    declare(aggregate_fcts::make_avg_function<int16_t>());
+#if 0
+    declare(AggregateFcts.sumFunctionForDecimal);
+    declare(AggregateFcts.sumFunctionForVarint);
+#endif
     declare(aggregate_fcts::make_avg_function<int32_t>());
     declare(aggregate_fcts::make_avg_function<int64_t>());
     declare(aggregate_fcts::make_avg_function<float>());
     declare(aggregate_fcts::make_avg_function<double>());
-    declare(aggregate_fcts::make_avg_function<boost::multiprecision::cpp_int>());
-    declare(aggregate_fcts::make_avg_function<big_decimal>());
+#if 0
+    declare(AggregateFcts.avgFunctionForVarint);
+    declare(AggregateFcts.avgFunctionForDecimal);
+#endif
 
     // also needed for smp:
 #if 0
@@ -358,7 +338,7 @@ function_call::execute_internal(cql_serialization_format sf, scalar_function& fu
             fun.return_type()->validate(*result);
         }
         return result;
-    } catch (marshal_exception& e) {
+    } catch (marshal_exception e) {
         throw runtime_exception(sprint("Return of function %s (%s) is not a valid value for its declared return type %s",
                                        fun, to_hex(result),
                                        *fun.return_type()->as_cql3_type()

cql3/keyspace_element_name.hh

@@ -42,7 +42,6 @@
 #pragma once
 
 #include "core/sstring.hh"
-#include "seastarx.hh"
 
 #include <experimental/optional>
 

cql3/lists.cc

@@ -111,7 +111,7 @@ lists::literal::test_assignment(database& db, const sstring& keyspace, shared_pt
 
 sstring
 lists::literal::to_string() const {
-    return std::to_string(_elements);
+    return ::to_string(_elements);
 }
 
 lists::value
@@ -242,7 +242,7 @@ lists::precision_time::get_next(db_clock::time_point millis) {
 }
 
 void
-lists::setter::execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) {
+lists::setter::execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) {
     const auto& value = _t->bind(params._options);
     if (value == constants::UNSET_VALUE) {
         return;
@@ -270,10 +270,15 @@ lists::setter_by_index::collect_marker_specification(shared_ptr<variable_specifi
 }
 
 void
-lists::setter_by_index::execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) {
+lists::setter_by_index::execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) {
     // we should not get here for frozen lists
     assert(column.type->is_multi_cell()); // "Attempted to set an individual element on a frozen list";
 
+    std::experimental::optional<clustering_key> row_key;
+    if (!column.is_static()) {
+        row_key = clustering_key::from_clustering_prefix(*params._schema, prefix);
+    }
+
     auto index = _idx->bind_and_get(params._options);
     if (index.is_null()) {
         throw exceptions::invalid_request_exception("Invalid null value for list index");
@@ -287,7 +292,7 @@ lists::setter_by_index::execute(mutation& m, const clustering_key_prefix& prefix
     }
 
     auto idx = net::ntoh(int32_t(*unaligned_cast<int32_t>(index->begin())));
-    auto&& existing_list_opt = params.get_prefetched_list(m.key().view(), prefix.view(), column);
+    auto&& existing_list_opt = params.get_prefetched_list(m.key(), std::move(row_key), column);
     if (!existing_list_opt) {
         throw exceptions::invalid_request_exception("Attempted to set an element on a list which is null");
     }
@@ -322,10 +327,15 @@ lists::setter_by_uuid::requires_read() {
 }
 
 void
-lists::setter_by_uuid::execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) {
+lists::setter_by_uuid::execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) {
     // we should not get here for frozen lists
     assert(column.type->is_multi_cell()); // "Attempted to set an individual element on a frozen list";
 
+    std::experimental::optional<clustering_key> row_key;
+    if (!column.is_static()) {
+        row_key = clustering_key::from_clustering_prefix(*params._schema, prefix);
+    }
+
     auto index = _idx->bind_and_get(params._options);
     auto value = _t->bind_and_get(params._options);
 
@@ -345,7 +355,7 @@ lists::setter_by_uuid::execute(mutation& m, const clustering_key_prefix& prefix,
 }
 
 void
-lists::appender::execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) {
+lists::appender::execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) {
     const auto& value = _t->bind(params._options);
     if (value == constants::UNSET_VALUE) {
         return;
@@ -357,7 +367,7 @@ lists::appender::execute(mutation& m, const clustering_key_prefix& prefix, const
 void
 lists::do_append(shared_ptr<term> value,
         mutation& m,
-        const clustering_key_prefix& prefix,
+        const exploded_clustering_prefix& prefix,
         const column_definition& column,
         const update_parameters& params) {
     auto&& list_value = dynamic_pointer_cast<lists::value>(value);
@@ -391,7 +401,7 @@ lists::do_append(shared_ptr<term> value,
 }
 
 void
-lists::prepender::execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) {
+lists::prepender::execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) {
     assert(column.type->is_multi_cell()); // "Attempted to prepend to a frozen list";
     auto&& value = _t->bind(params._options);
     if (!value || value == constants::UNSET_VALUE) {
@@ -423,10 +433,15 @@ lists::discarder::requires_read() {
 }
 
 void
-lists::discarder::execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) {
+lists::discarder::execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) {
     assert(column.type->is_multi_cell()); // "Attempted to delete from a frozen list";
 
-    auto&& existing_list = params.get_prefetched_list(m.key().view(), prefix.view(), column);
+    std::experimental::optional<clustering_key> row_key;
+    if (!column.is_static()) {
+        row_key = clustering_key::from_clustering_prefix(*params._schema, prefix);
+    }
+
+    auto&& existing_list = params.get_prefetched_list(m.key(), std::move(row_key), column);
     // We want to call bind before possibly returning to reject queries where the value provided is not a list.
     auto&& value = _t->bind(params._options);
 
@@ -475,7 +490,7 @@ lists::discarder_by_index::requires_read() {
 }
 
 void
-lists::discarder_by_index::execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) {
+lists::discarder_by_index::execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) {
     assert(column.type->is_multi_cell()); // "Attempted to delete an item by index from a frozen list";
     auto&& index = _t->bind(params._options);
     if (!index) {
@@ -489,7 +504,11 @@ lists::discarder_by_index::execute(mutation& m, const clustering_key_prefix& pre
     auto cvalue = dynamic_pointer_cast<constants::value>(index);
     assert(cvalue);
 
-    auto&& existing_list_opt = params.get_prefetched_list(m.key().view(), prefix.view(), column);
+    std::experimental::optional<clustering_key> row_key;
+    if (!column.is_static()) {
+        row_key = clustering_key::from_clustering_prefix(*params._schema, prefix);
+    }
+    auto&& existing_list_opt = params.get_prefetched_list(m.key(), std::move(row_key), column);
     int32_t idx = read_simple_exactly<int32_t>(*cvalue->_bytes);
     if (!existing_list_opt) {
         throw exceptions::invalid_request_exception("Attempted to delete an element from a list which is null");

cql3/lists.hh

@@ -146,7 +146,7 @@ public:
         setter(const column_definition& column, shared_ptr<term> t)
                 : operation(column, std::move(t)) {
         }
-        virtual void execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) override;
+        virtual void execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) override;
     };
 
     class setter_by_index : public operation {
@@ -158,7 +158,7 @@ public:
         }
         virtual bool requires_read() override;
         virtual void collect_marker_specification(shared_ptr<variable_specifications> bound_names);
-        virtual void execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) override;
+        virtual void execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) override;
     };
 
     class setter_by_uuid : public setter_by_index {
@@ -167,25 +167,25 @@ public:
             : setter_by_index(column, std::move(idx), std::move(t)) {
         }
         virtual bool requires_read() override;
-        virtual void execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) override;
+        virtual void execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) override;
     };
 
     class appender : public operation {
     public:
         using operation::operation;
-        virtual void execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) override;
+        virtual void execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) override;
     };
 
     static void do_append(shared_ptr<term> value,
             mutation& m,
-            const clustering_key_prefix& prefix,
+            const exploded_clustering_prefix& prefix,
             const column_definition& column,
             const update_parameters& params);
 
     class prepender : public operation {
     public:
         using operation::operation;
-        virtual void execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) override;
+        virtual void execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) override;
     };
 
     class discarder : public operation {
@@ -194,7 +194,7 @@ public:
                 : operation(column, std::move(t)) {
         }
         virtual bool requires_read() override;
-        virtual void execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) override;
+        virtual void execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) override;
     };
 
     class discarder_by_index : public operation {
@@ -203,7 +203,7 @@ public:
                 : operation(column, std::move(idx)) {
         }
         virtual bool requires_read() override;
-        virtual void execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params);
+        virtual void execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params);
     };
 };
 

cql3/maps.cc

@@ -269,7 +269,7 @@ maps::marker::bind(const query_options& options) {
 }
 
 void
-maps::setter::execute(mutation& m, const clustering_key_prefix& row_key, const update_parameters& params) {
+maps::setter::execute(mutation& m, const exploded_clustering_prefix& row_key, const update_parameters& params) {
     auto value = _t->bind(params._options);
     if (value == constants::UNSET_VALUE) {
         return;
@@ -292,7 +292,7 @@ maps::setter_by_key::collect_marker_specification(shared_ptr<variable_specificat
 }
 
 void
-maps::setter_by_key::execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) {
+maps::setter_by_key::execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) {
     using exceptions::invalid_request_exception;
     assert(column.type->is_multi_cell()); // "Attempted to set a value for a single key on a frozen map"m
     auto key = _k->bind_and_get(params._options);
@@ -315,7 +315,7 @@ maps::setter_by_key::execute(mutation& m, const clustering_key_prefix& prefix, c
 }
 
 void
-maps::putter::execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) {
+maps::putter::execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) {
     assert(column.type->is_multi_cell()); // "Attempted to add items to a frozen map";
     auto value = _t->bind(params._options);
     if (value != constants::UNSET_VALUE) {
@@ -324,7 +324,7 @@ maps::putter::execute(mutation& m, const clustering_key_prefix& prefix, const up
 }
 
 void
-maps::do_put(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params,
+maps::do_put(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params,
         shared_ptr<term> value, const column_definition& column) {
     auto map_value = dynamic_pointer_cast<maps::value>(value);
     if (column.type->is_multi_cell()) {
@@ -353,7 +353,7 @@ maps::do_put(mutation& m, const clustering_key_prefix& prefix, const update_para
 }
 
 void
-maps::discarder_by_key::execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) {
+maps::discarder_by_key::execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) {
     assert(column.type->is_multi_cell()); // "Attempted to delete a single key in a frozen map";
     auto&& key = _t->bind(params._options);
     if (!key) {

cql3/maps.hh

@@ -116,7 +116,7 @@ public:
                 : operation(column, std::move(t)) {
         }
 
-        virtual void execute(mutation& m, const clustering_key_prefix& row_key, const update_parameters& params) override;
+        virtual void execute(mutation& m, const exploded_clustering_prefix& row_key, const update_parameters& params) override;
     };
 
     class setter_by_key : public operation {
@@ -126,7 +126,7 @@ public:
             : operation(column, std::move(t)), _k(std::move(k)) {
         }
         virtual void collect_marker_specification(shared_ptr<variable_specifications> bound_names) override;
-        virtual void execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) override;
+        virtual void execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) override;
     };
 
     class putter : public operation {
@@ -134,10 +134,10 @@ public:
         putter(const column_definition& column, shared_ptr<term> t)
             : operation(column, std::move(t)) {
         }
-        virtual void execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) override;
+        virtual void execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) override;
     };
 
-    static void do_put(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params,
+    static void do_put(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params,
             shared_ptr<term> value, const column_definition& column);
 
     class discarder_by_key : public operation {
@@ -145,7 +145,7 @@ public:
         discarder_by_key(const column_definition& column, shared_ptr<term> k)
                 : operation(column, std::move(k)) {
         }
-        virtual void execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) override;
+        virtual void execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) override;
     };
 };
 

cql3/operation.cc

@@ -36,7 +36,6 @@
  * You should have received a copy of the GNU General Public License
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <utility>
 
 #include "operation.hh"
 #include "operation_impl.hh"
@@ -46,19 +45,15 @@
 
 namespace cql3 {
 
-sstring
-operation::set_element::to_string(const column_definition& receiver) const {
-    return format("{}[{}] = {}", receiver.name_as_text(), *_selector, *_value);
-}
 
 shared_ptr<operation>
 operation::set_element::prepare(database& db, const sstring& keyspace, const column_definition& receiver) {
     using exceptions::invalid_request_exception;
     auto rtype = dynamic_pointer_cast<const collection_type_impl>(receiver.type);
     if (!rtype) {
-        throw invalid_request_exception(sprint("Invalid operation (%s) for non collection column %s", to_string(receiver), receiver.name()));
+        throw invalid_request_exception(sprint("Invalid operation (%s) for non collection column %s", receiver, receiver.name()));
     } else if (!rtype->is_multi_cell()) {
-        throw invalid_request_exception(sprint("Invalid operation (%s) for frozen collection column %s", to_string(receiver), receiver.name()));
+        throw invalid_request_exception(sprint("Invalid operation (%s) for frozen collection column %s", receiver, receiver.name()));
     }
 
     if (&rtype->_kind == &collection_type_impl::kind::list) {
@@ -71,7 +66,7 @@ operation::set_element::prepare(database& db, const sstring& keyspace, const col
             return make_shared<lists::setter_by_index>(receiver, idx, lval);
         }
     } else if (&rtype->_kind == &collection_type_impl::kind::set) {
-        throw invalid_request_exception(sprint("Invalid operation (%s) for set column %s", to_string(receiver), receiver.name()));
+        throw invalid_request_exception(sprint("Invalid operation (%s) for set column %s", receiver, receiver.name()));
     } else if (&rtype->_kind == &collection_type_impl::kind::map) {
         auto key = _selector->prepare(db, keyspace, maps::key_spec_of(*receiver.column_specification));
         auto mval = _value->prepare(db, keyspace, maps::value_spec_of(*receiver.column_specification));
@@ -87,11 +82,6 @@ operation::set_element::is_compatible_with(shared_ptr<raw_update> other) {
     return !dynamic_pointer_cast<set_value>(std::move(other));
 }
 
-sstring
-operation::addition::to_string(const column_definition& receiver) const {
-    return format("{} = {} + {}", receiver.name_as_text(), receiver.name_as_text(), *_value);
-}
-
 shared_ptr<operation>
 operation::addition::prepare(database& db, const sstring& keyspace, const column_definition& receiver) {
     auto v = _value->prepare(db, keyspace, receiver.column_specification);
@@ -99,11 +89,11 @@ operation::addition::prepare(database& db, const sstring& keyspace, const column
     auto ctype = dynamic_pointer_cast<const collection_type_impl>(receiver.type);
     if (!ctype) {
         if (!receiver.is_counter()) {
-            throw exceptions::invalid_request_exception(sprint("Invalid operation (%s) for non counter column %s", to_string(receiver), receiver.name()));
+            throw exceptions::invalid_request_exception(sprint("Invalid operation (%s) for non counter column %s", receiver, receiver.name()));
         }
         return make_shared<constants::adder>(receiver, v);
     } else if (!ctype->is_multi_cell()) {
-        throw exceptions::invalid_request_exception(sprint("Invalid operation (%s) for frozen collection column %s", to_string(receiver), receiver.name()));
+        throw exceptions::invalid_request_exception(sprint("Invalid operation (%s) for frozen collection column %s", receiver, receiver.name()));
     }
 
     if (&ctype->_kind == &collection_type_impl::kind::list) {
@@ -122,24 +112,19 @@ operation::addition::is_compatible_with(shared_ptr<raw_update> other) {
     return !dynamic_pointer_cast<set_value>(other);
 }
 
-sstring
-operation::subtraction::to_string(const column_definition& receiver) const {
-    return format("{} = {} - {}", receiver.name_as_text(), receiver.name_as_text(), *_value);
-}
-
 shared_ptr<operation>
 operation::subtraction::prepare(database& db, const sstring& keyspace, const column_definition& receiver) {
     auto ctype = dynamic_pointer_cast<const collection_type_impl>(receiver.type);
     if (!ctype) {
         if (!receiver.is_counter()) {
-            throw exceptions::invalid_request_exception(sprint("Invalid operation (%s) for non counter column %s", to_string(receiver), receiver.name()));
+            throw exceptions::invalid_request_exception(sprint("Invalid operation (%s) for non counter column %s", receiver, receiver.name()));
         }
         auto v = _value->prepare(db, keyspace, receiver.column_specification);
         return make_shared<constants::subtracter>(receiver, v);
     }
     if (!ctype->is_multi_cell()) {
         throw exceptions::invalid_request_exception(
-                sprint("Invalid operation (%s) for frozen collection column %s", to_string(receiver), receiver.name()));
+                sprint("Invalid operation (%s) for frozen collection column %s", receiver, receiver.name()));
     }
 
     if (&ctype->_kind == &collection_type_impl::kind::list) {
@@ -164,19 +149,14 @@ operation::subtraction::is_compatible_with(shared_ptr<raw_update> other) {
     return !dynamic_pointer_cast<set_value>(other);
 }
 
-sstring
-operation::prepend::to_string(const column_definition& receiver) const {
-    return format("{} = {} + {}", receiver.name_as_text(), *_value, receiver.name_as_text());
-}
-
 shared_ptr<operation>
 operation::prepend::prepare(database& db, const sstring& keyspace, const column_definition& receiver) {
     auto v = _value->prepare(db, keyspace, receiver.column_specification);
 
     if (!dynamic_cast<const list_type_impl*>(receiver.type.get())) {
-        throw exceptions::invalid_request_exception(sprint("Invalid operation (%s) for non list column %s", to_string(receiver), receiver.name()));
+        throw exceptions::invalid_request_exception(sprint("Invalid operation (%s) for non list column %s", receiver, receiver.name()));
     } else if (!receiver.type->is_multi_cell()) {
-        throw exceptions::invalid_request_exception(sprint("Invalid operation (%s) for frozen list column %s", to_string(receiver), receiver.name()));
+        throw exceptions::invalid_request_exception(sprint("Invalid operation (%s) for frozen list column %s", receiver, receiver.name()));
     }
 
     return make_shared<lists::prepender>(receiver, std::move(v));
@@ -212,78 +192,6 @@ operation::set_value::prepare(database& db, const sstring& keyspace, const colum
     }
 }
 
-::shared_ptr <operation>
-operation::set_counter_value_from_tuple_list::prepare(database& db, const sstring& keyspace, const column_definition& receiver) {
-    static thread_local const data_type counter_tuple_type = tuple_type_impl::get_instance({int32_type, uuid_type, long_type, long_type});
-    static thread_local const data_type counter_tuple_list_type = list_type_impl::get_instance(counter_tuple_type, true);
-
-    if (!receiver.type->is_counter()) {
-        throw exceptions::invalid_request_exception(sprint("Column %s is not a counter", receiver.name_as_text()));
-    }
-
-    // We need to fake a column of list<tuple<...>> to prepare the value term
-    auto & os = receiver.column_specification;
-    auto spec = make_shared<cql3::column_specification>(os->ks_name, os->cf_name, os->name, counter_tuple_list_type);
-    auto v = _value->prepare(db, keyspace, spec);
-
-    // Will not be used elsewhere, so make it local.
-    class counter_setter : public operation {
-    public:
-        using operation::operation;
-
-        bool is_raw_counter_shard_write() const override {
-            return true;
-        }
-        void execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) override {
-            const auto& value = _t->bind(params._options);
-            auto&& list_value = dynamic_pointer_cast<lists::value>(value);
-
-            if (!list_value) {
-                throw std::invalid_argument("Invalid input data to counter set");
-            }
-
-            counter_id last(utils::UUID(0, 0));
-            counter_cell_builder ccb(list_value->_elements.size());
-            for (auto& bo : list_value->_elements) {
-                // lexical etc cast fails should be enough type checking here.
-                auto tuple = value_cast<tuple_type_impl::native_type>(counter_tuple_type->deserialize(*bo));
-                auto shard = value_cast<int>(tuple[0]);
-                auto id = counter_id(value_cast<utils::UUID>(tuple[1]));
-                auto clock = value_cast<int64_t>(tuple[2]);
-                auto value = value_cast<int64_t>(tuple[3]);
-
-                using namespace std::rel_ops;
-
-                if (id <= last) {
-                    throw marshal_exception(
-                                    sprint("invalid counter id order, %s <= %s",
-                                                    id.to_uuid().to_sstring(),
-                                                    last.to_uuid().to_sstring()));
-                }
-                last = id;
-                // TODO: maybe allow more than global values to propagate,
-                // though we don't (yet at least) in sstable::partition so...
-                switch (shard) {
-                case 'g':
-                    ccb.add_shard(counter_shard(id, value, clock));
-                    break;
-                case 'l':
-                    throw marshal_exception("encountered a local shard in a counter cell");
-                case 'r':
-                    throw marshal_exception("encountered remote shards in a counter cell");
-                default:
-                    throw marshal_exception(sprint("encountered unknown shard %d in a counter cell", shard));
-                }
-            }
-            // Note. this is a counter value cell, not an update.
-            // see counters.cc, we need to detect this.
-            m.set_cell(prefix, column, ccb.build(params.timestamp()));
-        }
-    };
-
-    return make_shared<counter_setter>(receiver, v);
-};
-
 bool
 operation::set_value::is_compatible_with(::shared_ptr <raw_update> other) {
     // We don't allow setting multiple time the same column, because 1)

cql3/operation.hh

@@ -103,10 +103,6 @@ public:
         return _t && _t->uses_function(ks_name, function_name);
     }
 
-    virtual bool is_raw_counter_shard_write() const {
-        return false;
-    }
-
     /**
     * @return whether the operation requires a read of the previous value to be executed
     * (only lists setterByIdx, discard and discardByIdx requires that).
@@ -130,7 +126,7 @@ public:
     /**
      * Execute the operation.
      */
-    virtual void execute(mutation& m, const clustering_key_prefix& prefix, const update_parameters& params) = 0;
+    virtual void execute(mutation& m, const exploded_clustering_prefix& prefix, const update_parameters& params) = 0;
 
     /**
      * A parsed raw UPDATE operation.
@@ -197,14 +193,11 @@ public:
     };
 
     class set_value;
-    class set_counter_value_from_tuple_list;
 
     class set_element : public raw_update {
         const shared_ptr<term::raw> _selector;
         const shared_ptr<term::raw> _value;
         const bool _by_uuid;
-    private:
-        sstring to_string(const column_definition& receiver) const;
     public:
         set_element(shared_ptr<term::raw> selector, shared_ptr<term::raw> value, bool by_uuid = false)
             : _selector(std::move(selector)), _value(std::move(value)), _by_uuid(by_uuid) {
@@ -217,8 +210,6 @@ public:
 
     class addition : public raw_update {
         const shared_ptr<term::raw> _value;
-    private:
-        sstring to_string(const column_definition& receiver) const;
     public:
         addition(shared_ptr<term::raw> value)
                 : _value(value) {
@@ -231,8 +222,6 @@ public:
 
     class subtraction : public raw_update {
         const shared_ptr<term::raw> _value;
-    private:
-        sstring to_string(const column_definition& receiver) const;
     public:
         subtraction(shared_ptr<term::raw> value)
                 : _value(value) {
@@ -245,8 +234,6 @@ public:
 
     class prepend : public raw_update {
         shared_ptr<term::raw> _value;
-    private:
-        sstring to_string(const column_definition& receiver) const;
     public:
         prepend(shared_ptr<term::raw> value)
                 : _value(std::move(value)) {

cql3/operation_impl.hh

@@ -50,7 +50,7 @@
 namespace cql3 {
 
 class operation::set_value : public raw_update {
-protected:
+private:
     ::shared_ptr<term::raw> _value;
 public:
     set_value(::shared_ptr<term::raw> value) : _value(std::move(value)) {}
@@ -67,12 +67,6 @@ public:
     virtual bool is_compatible_with(::shared_ptr <raw_update> other) override;
 };
 
-class operation::set_counter_value_from_tuple_list : public set_value {
-public:
-    using set_value::set_value;
-    ::shared_ptr <operation> prepare(database& db, const sstring& keyspace, const column_definition& receiver) override;
-};
-
 class operation::column_deletion : public raw_deletion {
 private:
     ::shared_ptr<column_identifier::raw> _id;

cql3/operator.hh

@@ -44,7 +44,6 @@
 #include <cstddef>
 #include <iosfwd>
 #include "core/sstring.hh"
-#include "seastarx.hh"
 
 namespace cql3 {
 
@@ -71,12 +70,7 @@ private:
         , _text(std::move(text))
     {}
 public:
-    operator_type(const operator_type&) = delete;
-    operator_type& operator=(const operator_type&) = delete;
     const operator_type& reverse() const { return _reverse; }
-    bool is_slice() const {
-        return (*this == LT) || (*this == LTE) || (*this == GT) || (*this == GTE);
-    }
     sstring to_string() const { return _text; }
     bool operator==(const operator_type& other) const { return this == &other; }
     bool operator!=(const operator_type& other) const { return this != &other; }

cql3/prepared_statements_cache.hh

@@ -1,171 +0,0 @@
-/*
- * Copyright (C) 2017 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 "utils/loading_cache.hh"
-#include "cql3/statements/prepared_statement.hh"
-
-namespace cql3 {
-
-using prepared_cache_entry = std::unique_ptr<statements::prepared_statement>;
-
-struct prepared_cache_entry_size {
-    size_t operator()(const prepared_cache_entry& val) {
-        // TODO: improve the size approximation
-        return 10000;
-    }
-};
-
-typedef bytes cql_prepared_id_type;
-typedef int32_t thrift_prepared_id_type;
-
-/// \brief The key of the prepared statements cache
-///
-/// We are going to store the CQL and Thrift prepared statements in the same cache therefore we need generate the key
-/// that is going to be unique in both cases. Thrift use int32_t as a prepared statement ID, CQL - MD5 digest.
-///
-/// We are going to use an std::pair<CQL_PREP_ID_TYPE, int64_t> as a key. For CQL statements we will use {CQL_PREP_ID, std::numeric_limits<int64_t>::max()} as a key
-/// and for Thrift - {CQL_PREP_ID_TYPE(0), THRIFT_PREP_ID}. This way CQL and Thrift keys' values will never collide.
-class prepared_cache_key_type {
-public:
-    using cache_key_type = std::pair<cql_prepared_id_type, int64_t>;
-
-private:
-    cache_key_type _key;
-
-public:
-    prepared_cache_key_type() = default;
-    explicit prepared_cache_key_type(cql_prepared_id_type cql_id) : _key(std::move(cql_id), std::numeric_limits<int64_t>::max()) {}
-    explicit prepared_cache_key_type(thrift_prepared_id_type thrift_id) : _key(cql_prepared_id_type(), thrift_id) {}
-
-    cache_key_type& key() { return _key; }
-    const cache_key_type& key() const { return _key; }
-
-    static const cql_prepared_id_type& cql_id(const prepared_cache_key_type& key) {
-        return key.key().first;
-    }
-    static thrift_prepared_id_type thrift_id(const prepared_cache_key_type& key) {
-        return key.key().second;
-    }
-};
-
-class prepared_statements_cache {
-public:
-    struct stats {
-        uint64_t prepared_cache_evictions = 0;
-    };
-
-    static stats& shard_stats() {
-        static thread_local stats _stats;
-        return _stats;
-    }
-
-    struct prepared_cache_stats_updater {
-        static void inc_hits() noexcept {}
-        static void inc_misses() noexcept {}
-        static void inc_blocks() noexcept {}
-        static void inc_evictions() noexcept {
-            ++shard_stats().prepared_cache_evictions;
-        }
-    };
-
-private:
-    using cache_key_type = typename prepared_cache_key_type::cache_key_type;
-    using cache_type = utils::loading_cache<cache_key_type, prepared_cache_entry, utils::loading_cache_reload_enabled::no, prepared_cache_entry_size, utils::tuple_hash, std::equal_to<cache_key_type>, prepared_cache_stats_updater>;
-    using cache_value_ptr = typename cache_type::value_ptr;
-    using cache_iterator = typename cache_type::iterator;
-    using checked_weak_ptr = typename statements::prepared_statement::checked_weak_ptr;
-    struct value_extractor_fn {
-        checked_weak_ptr operator()(prepared_cache_entry& e) const {
-            return e->checked_weak_from_this();
-        }
-    };
-
-    static const std::chrono::minutes entry_expiry;
-
-public:
-    using key_type = prepared_cache_key_type;
-    using value_type = checked_weak_ptr;
-    using statement_is_too_big = typename cache_type::entry_is_too_big;
-    /// \note both iterator::reference and iterator::value_type are checked_weak_ptr
-    using iterator = boost::transform_iterator<value_extractor_fn, cache_iterator>;
-
-private:
-    cache_type _cache;
-    value_extractor_fn _value_extractor_fn;
-
-public:
-    prepared_statements_cache(logging::logger& logger)
-        : _cache(memory::stats().total_memory() / 256, entry_expiry, logger)
-    {}
-
-    template <typename LoadFunc>
-    future<value_type> get(const key_type& key, LoadFunc&& load) {
-        return _cache.get_ptr(key.key(), [load = std::forward<LoadFunc>(load)] (const cache_key_type&) { return load(); }).then([] (cache_value_ptr v_ptr) {
-            return make_ready_future<value_type>((*v_ptr)->checked_weak_from_this());
-        });
-    }
-
-    iterator find(const key_type& key) {
-        return boost::make_transform_iterator(_cache.find(key.key()), _value_extractor_fn);
-    }
-
-    iterator end() {
-        return boost::make_transform_iterator(_cache.end(), _value_extractor_fn);
-    }
-
-    iterator begin() {
-        return boost::make_transform_iterator(_cache.begin(), _value_extractor_fn);
-    }
-
-    template <typename Pred>
-    void remove_if(Pred&& pred) {
-        static_assert(std::is_same<bool, std::result_of_t<Pred(::shared_ptr<cql_statement>)>>::value, "Bad Pred signature");
-
-        _cache.remove_if([&pred] (const prepared_cache_entry& e) {
-            return pred(e->statement);
-        });
-    }
-
-    size_t size() const {
-        return _cache.size();
-    }
-
-    size_t memory_footprint() const {
-        return _cache.memory_footprint();
-    }
-};
-}
-
-namespace std { // for prepared_statements_cache log printouts
-inline std::ostream& operator<<(std::ostream& os, const typename cql3::prepared_cache_key_type::cache_key_type& p) {
-    os << "{cql_id: " << p.first << ", thrift_id: " << p.second << "}";
-    return os;
-}
-
-inline std::ostream& operator<<(std::ostream& os, const cql3::prepared_cache_key_type& p) {
-    os << p.key();
-    return os;
-}
-}

cql3/query_options.cc

@@ -49,23 +49,6 @@ thread_local const query_options::specific_options query_options::specific_optio
 thread_local query_options query_options::DEFAULT{db::consistency_level::ONE, std::experimental::nullopt,
     std::vector<cql3::raw_value_view>(), false, query_options::specific_options::DEFAULT, cql_serialization_format::latest()};
 
-query_options::query_options(db::consistency_level consistency,
-                           std::experimental::optional<std::vector<sstring_view>> names,
-                           std::vector<cql3::raw_value> values,
-                           std::vector<cql3::raw_value_view> value_views,
-                           bool skip_metadata,
-                           specific_options options,
-                           cql_serialization_format sf)
-   : _consistency(consistency)
-   , _names(std::move(names))
-   , _values(std::move(values))
-   , _value_views(value_views)
-   , _skip_metadata(skip_metadata)
-   , _options(std::move(options))
-   , _cql_serialization_format(sf)
-{
-}
-
 query_options::query_options(db::consistency_level consistency,
                              std::experimental::optional<std::vector<sstring_view>> names,
                              std::vector<cql3::raw_value> values,
@@ -99,29 +82,29 @@ query_options::query_options(db::consistency_level consistency,
 {
 }
 
-query_options::query_options(db::consistency_level cl, std::vector<cql3::raw_value> values, specific_options options)
+query_options::query_options(query_options&& o, std::vector<std::vector<cql3::raw_value_view>> value_views)
+    : query_options(std::move(o))
+{
+    std::vector<query_options> tmp;
+    tmp.reserve(value_views.size());
+    std::transform(value_views.begin(), value_views.end(), std::back_inserter(tmp), [this](auto& vals) {
+        return query_options(_consistency, {}, vals, _skip_metadata, _options, _cql_serialization_format);
+    });
+    _batch_options = std::move(tmp);
+}
+
+query_options::query_options(db::consistency_level cl, std::vector<cql3::raw_value> values)
     : query_options(
           cl,
           {},
           std::move(values),
           false,
-          std::move(options),
+          query_options::specific_options::DEFAULT,
           cql_serialization_format::latest()
       )
 {
 }
 
-query_options::query_options(std::unique_ptr<query_options> qo, ::shared_ptr<service::pager::paging_state> paging_state)
-        : query_options(qo->_consistency,
-        std::move(qo->_names),
-        std::move(qo->_values),
-        std::move(qo->_value_views),
-        qo->_skip_metadata,
-        std::move(query_options::specific_options{qo->_options.page_size, paging_state, qo->_options.serial_consistency, qo->_options.timestamp}),
-        qo->_cql_serialization_format) {
-
-}
-
 query_options::query_options(std::vector<cql3::raw_value> values)
     : query_options(
           db::consistency_level::ONE, std::move(values))

cql3/query_options.hh

@@ -41,7 +41,6 @@
 
 #pragma once
 
-#include <seastar/util/gcc6-concepts.hh>
 #include "timestamp.hh"
 #include "bytes.hh"
 #include "db/consistency_level.hh"
@@ -78,26 +77,6 @@ private:
     const specific_options _options;
     cql_serialization_format _cql_serialization_format;
     std::experimental::optional<std::vector<query_options>> _batch_options;
-
-private:
-    /**
-     * @brief Batch query_options constructor.
-     *
-     * Requirements:
-     *   - @tparam OneMutationDataRange has a begin() and end() iterators.
-     *   - The values of @tparam OneMutationDataRange are of either raw_value_view or raw_value types.
-     *
-     * @param o Base query_options object. query_options objects for each statement in the batch will derive the values from it.
-     * @param values_ranges a vector of values ranges for each statement in the batch.
-     */
-    template<typename OneMutationDataRange>
-    GCC6_CONCEPT( requires requires (OneMutationDataRange range) {
-         std::begin(range);
-         std::end(range);
-    } && ( requires (OneMutationDataRange range) { { *range.begin() } -> raw_value_view; } ||
-           requires (OneMutationDataRange range) { { *range.begin() } -> raw_value; } ) )
-    explicit query_options(query_options&& o, std::vector<OneMutationDataRange> values_ranges);
-
 public:
     query_options(query_options&&) = default;
     query_options(const query_options&) = delete;
@@ -108,13 +87,6 @@ public:
                            bool skip_metadata,
                            specific_options options,
                            cql_serialization_format sf);
-    explicit query_options(db::consistency_level consistency,
-                           std::experimental::optional<std::vector<sstring_view>> names,
-                           std::vector<cql3::raw_value> values,
-                           std::vector<cql3::raw_value_view> value_views,
-                           bool skip_metadata,
-                           specific_options options,
-                           cql_serialization_format sf);
     explicit query_options(db::consistency_level consistency,
                            std::experimental::optional<std::vector<sstring_view>> names,
                            std::vector<cql3::raw_value_view> value_views,
@@ -122,33 +94,15 @@ public:
                            specific_options options,
                            cql_serialization_format sf);
 
-    /**
-     * @brief Batch query_options factory.
-     *
-     * Requirements:
-     *   - @tparam OneMutationDataRange has a begin() and end() iterators.
-     *   - The values of @tparam OneMutationDataRange are of either raw_value_view or raw_value types.
-     *
-     * @param o Base query_options object. query_options objects for each statement in the batch will derive the values from it.
-     * @param values_ranges a vector of values ranges for each statement in the batch.
-     */
-    template<typename OneMutationDataRange>
-    GCC6_CONCEPT( requires requires (OneMutationDataRange range) {
-         std::begin(range);
-         std::end(range);
-    } && ( requires (OneMutationDataRange range) { { *range.begin() } -> raw_value_view; } ||
-           requires (OneMutationDataRange range) { { *range.begin() } -> raw_value; } ) )
-    static query_options make_batch_options(query_options&& o, std::vector<OneMutationDataRange> values_ranges) {
-        return query_options(std::move(o), std::move(values_ranges));
-    }
+    // Batch query_options constructor
+    explicit query_options(query_options&&, std::vector<std::vector<cql3::raw_value_view>> value_views);
 
     // It can't be const because of prepare()
     static thread_local query_options DEFAULT;
 
     // forInternalUse
     explicit query_options(std::vector<cql3::raw_value> values);
-    explicit query_options(db::consistency_level, std::vector<cql3::raw_value> values, specific_options options = specific_options::DEFAULT);
-    explicit query_options(std::unique_ptr<query_options>, ::shared_ptr<service::pager::paging_state> paging_state);
+    explicit query_options(db::consistency_level, std::vector<cql3::raw_value> values);
 
     db::consistency_level get_consistency() const;
     cql3::raw_value_view get_value_at(size_t idx) const;
@@ -176,21 +130,4 @@ private:
     void fill_value_views();
 };
 
-template<typename OneMutationDataRange>
-GCC6_CONCEPT( requires requires (OneMutationDataRange range) {
-     std::begin(range);
-     std::end(range);
-} && ( requires (OneMutationDataRange range) { { *range.begin() } -> raw_value_view; } ||
-       requires (OneMutationDataRange range) { { *range.begin() } -> raw_value; } ) )
-query_options::query_options(query_options&& o, std::vector<OneMutationDataRange> values_ranges)
-    : query_options(std::move(o))
-{
-    std::vector<query_options> tmp;
-    tmp.reserve(values_ranges.size());
-    std::transform(values_ranges.begin(), values_ranges.end(), std::back_inserter(tmp), [this](auto& values_range) {
-        return query_options(_consistency, {}, std::move(values_range), _skip_metadata, _options, _cql_serialization_format);
-    });
-    _batch_options = std::move(tmp);
-}
-
 }

cql3/query_processor.cc

@@ -38,38 +38,36 @@
  * You should have received a copy of the GNU General Public License
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
-
-#include "cql3/query_processor.hh"
-
-#include <cryptopp/md5.h>
 #include <seastar/core/metrics.hh>
 
+#include "cql3/query_processor.hh"
 #include "cql3/CqlParser.hpp"
 #include "cql3/error_collector.hh"
 #include "cql3/statements/batch_statement.hh"
 #include "cql3/util.hh"
 
+#include "transport/messages/result_message.hh"
+
+#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
+#include <cryptopp/md5.h>
+
 namespace cql3 {
 
 using namespace statements;
-using namespace cql_transport::messages;
+using namespace transport::messages;
 
 logging::logger log("query_processor");
-logging::logger prep_cache_log("prepared_statements_cache");
 
 distributed<query_processor> _the_query_processor;
 
 const sstring query_processor::CQL_VERSION = "3.3.1";
 
-const std::chrono::minutes prepared_statements_cache::entry_expiry = std::chrono::minutes(60);
-
 class query_processor::internal_state {
     service::query_state _qs;
 public:
-    internal_state() : _qs(service::client_state{service::client_state::internal_tag()}) {
-    }
+    internal_state()
+        : _qs(service::client_state{service::client_state::internal_tag()})
+    { }
     operator service::query_state&() {
         return _qs;
     }
@@ -91,102 +89,64 @@ api::timestamp_type query_processor::next_timestamp() {
     return _internal_state->next_timestamp();
 }
 
-query_processor::query_processor(distributed<service::storage_proxy>& proxy, distributed<database>& db)
-        : _migration_subscriber{std::make_unique<migration_subscriber>(this)}
-        , _proxy(proxy)
-        , _db(db)
-        , _internal_state(new internal_state())
-        , _prepared_cache(prep_cache_log) {
+query_processor::query_processor(distributed<service::storage_proxy>& proxy,
+                                 distributed<database>& db)
+    : _migration_subscriber{std::make_unique<migration_subscriber>(this)}
+    , _proxy(proxy)
+    , _db(db)
+    , _internal_state(new internal_state())
+{
     namespace sm = seastar::metrics;
 
-    _metrics.add_group(
-            "query_processor",
-            {
-                    sm::make_derive(
-                            "statements_prepared",
-                            _stats.prepare_invocations,
-                            sm::description("Counts a total number of parsed CQL requests."))});
+    _metrics.add_group("query_processor", {
+        sm::make_derive("statements_prepared", _stats.prepare_invocations,
+                        sm::description("Counts a total number of parsed CQL requests.")),
+    });
 
-    _metrics.add_group(
-            "cql",
-            {
-                    sm::make_derive(
-                            "reads",
-                            _cql_stats.reads,
-                            sm::description("Counts a total number of CQL read requests.")),
+    _metrics.add_group("cql", {
+        sm::make_derive("reads", _cql_stats.reads,
+                        sm::description("Counts a total number of CQL read requests.")),
 
-                    sm::make_derive(
-                            "inserts",
-                            _cql_stats.inserts,
-                            sm::description("Counts a total number of CQL INSERT requests.")),
+        sm::make_derive("inserts", _cql_stats.inserts,
+                        sm::description("Counts a total number of CQL INSERT requests.")),
 
-                    sm::make_derive(
-                            "updates",
-                            _cql_stats.updates,
-                            sm::description("Counts a total number of CQL UPDATE requests.")),
+        sm::make_derive("updates", _cql_stats.updates,
+                        sm::description("Counts a total number of CQL UPDATE requests.")),
 
-                    sm::make_derive(
-                            "deletes",
-                            _cql_stats.deletes,
-                            sm::description("Counts a total number of CQL DELETE requests.")),
+        sm::make_derive("deletes", _cql_stats.deletes,
+                        sm::description("Counts a total number of CQL DELETE requests.")),
 
-                    sm::make_derive(
-                            "batches",
-                            _cql_stats.batches,
-                            sm::description("Counts a total number of CQL BATCH requests.")),
+        sm::make_derive("batches", _cql_stats.batches,
+                        sm::description("Counts a total number of CQL BATCH requests.")),
 
-                    sm::make_derive(
-                            "statements_in_batches",
-                            _cql_stats.statements_in_batches,
-                            sm::description("Counts a total number of sub-statements in CQL BATCH requests.")),
+        sm::make_derive("statements_in_batches", _cql_stats.statements_in_batches,
+                        sm::description("Counts a total number of sub-statements in CQL BATCH requests.")),
 
-                    sm::make_derive(
-                            "batches_pure_logged",
-                            _cql_stats.batches_pure_logged,
-                            sm::description(
-                                    "Counts a total number of LOGGED batches that were executed as LOGGED batches.")),
+        sm::make_derive("batches_pure_logged", _cql_stats.batches_pure_logged,
+                        sm::description("Counts a total number of LOGGED batches that were executed as LOGGED batches.")),
 
-                    sm::make_derive(
-                            "batches_pure_unlogged",
-                            _cql_stats.batches_pure_unlogged,
-                            sm::description(
-                                    "Counts a total number of UNLOGGED batches that were executed as UNLOGGED "
-                                    "batches.")),
+        sm::make_derive("batches_pure_unlogged", _cql_stats.batches_pure_unlogged,
+                        sm::description("Counts a total number of UNLOGGED batches that were executed as UNLOGGED batches.")),
 
-                    sm::make_derive(
-                            "batches_unlogged_from_logged",
-                            _cql_stats.batches_unlogged_from_logged,
-                            sm::description("Counts a total number of LOGGED batches that were executed as UNLOGGED "
-                                            "batches.")),
-
-                    sm::make_derive(
-                            "prepared_cache_evictions",
-                            [] { return prepared_statements_cache::shard_stats().prepared_cache_evictions; },
-                            sm::description("Counts a number of prepared statements cache entries evictions.")),
-
-                    sm::make_gauge(
-                            "prepared_cache_size",
-                            [this] { return _prepared_cache.size(); },
-                            sm::description("A number of entries in the prepared statements cache.")),
-
-                    sm::make_gauge(
-                            "prepared_cache_memory_footprint",
-                            [this] { return _prepared_cache.memory_footprint(); },
-                            sm::description("Size (in bytes) of the prepared statements cache."))});
+        sm::make_derive("batches_unlogged_from_logged", _cql_stats.batches_unlogged_from_logged,
+                        sm::description("Counts a total number of LOGGED batches that were executed as UNLOGGED batches.")),
+    });
 
     service::get_local_migration_manager().register_listener(_migration_subscriber.get());
 }
 
-query_processor::~query_processor() {
-}
+query_processor::~query_processor()
+{}
 
-future<> query_processor::stop() {
+future<> query_processor::stop()
+{
     service::get_local_migration_manager().unregister_listener(_migration_subscriber.get());
     return make_ready_future<>();
 }
 
 future<::shared_ptr<result_message>>
-query_processor::process(const sstring_view& query_string, service::query_state& query_state, query_options& options) {
+query_processor::process(const sstring_view& query_string, service::query_state& query_state, query_options& options)
+{
     log.trace("process: \"{}\"", query_string);
     tracing::trace(query_state.get_trace_state(), "Parsing a statement");
     auto p = get_statement(query_string, query_state.get_client_state());
@@ -206,16 +166,20 @@ query_processor::process(const sstring_view& query_string, service::query_state&
 }
 
 future<::shared_ptr<result_message>>
-query_processor::process_statement(
-        ::shared_ptr<cql_statement> statement,
-        service::query_state& query_state,
-        const query_options& options) {
+query_processor::process_statement(::shared_ptr<cql_statement> statement,
+                                   service::query_state& query_state,
+                                   const query_options& options)
+{
+#if 0
+        logger.trace("Process {} @CL.{}", statement, options.getConsistency());
+#endif
+
     return statement->check_access(query_state.get_client_state()).then([this, statement, &query_state, &options]() {
         auto& client_state = query_state.get_client_state();
 
         statement->validate(_proxy, client_state);
 
-        auto fut = make_ready_future<::shared_ptr<cql_transport::messages::result_message>>();
+        auto fut = make_ready_future<::shared_ptr<transport::messages::result_message>>();
         if (client_state.is_internal()) {
             fut = statement->execute_internal(_proxy, query_state, options);
         } else  {
@@ -232,51 +196,85 @@ query_processor::process_statement(
     });
 }
 
-future<::shared_ptr<cql_transport::messages::result_message::prepared>>
-query_processor::prepare(sstring query_string, service::query_state& query_state) {
+future<::shared_ptr<transport::messages::result_message::prepared>>
+query_processor::prepare(const std::experimental::string_view& query_string, service::query_state& query_state)
+{
     auto& client_state = query_state.get_client_state();
-    return prepare(std::move(query_string), client_state, client_state.is_thrift());
+    return prepare(query_string, client_state, client_state.is_thrift());
 }
 
-future<::shared_ptr<cql_transport::messages::result_message::prepared>>
-query_processor::prepare(sstring query_string, const service::client_state& client_state, bool for_thrift) {
-    using namespace cql_transport::messages;
+future<::shared_ptr<transport::messages::result_message::prepared>>
+query_processor::prepare(const std::experimental::string_view& query_string,
+                         const service::client_state& client_state,
+                         bool for_thrift)
+{
+    auto existing = get_stored_prepared_statement(query_string, client_state.get_raw_keyspace(), for_thrift);
+    if (existing) {
+        return make_ready_future<::shared_ptr<transport::messages::result_message::prepared>>(existing);
+    }
+    auto prepared = get_statement(query_string, client_state);
+    auto bound_terms = prepared->statement->get_bound_terms();
+    if (bound_terms > std::numeric_limits<uint16_t>::max()) {
+        throw exceptions::invalid_request_exception(sprint("Too many markers(?). %d markers exceed the allowed maximum of %d", bound_terms, std::numeric_limits<uint16_t>::max()));
+    }
+    assert(bound_terms == prepared->bound_names.size());
+    return store_prepared_statement(query_string, client_state.get_raw_keyspace(), std::move(prepared), for_thrift);
+}
+
+::shared_ptr<transport::messages::result_message::prepared>
+query_processor::get_stored_prepared_statement(const std::experimental::string_view& query_string,
+                                               const sstring& keyspace,
+                                               bool for_thrift)
+{
     if (for_thrift) {
-        return prepare_one<result_message::prepared::thrift>(
-                std::move(query_string),
-                client_state,
-                compute_thrift_id, prepared_cache_key_type::thrift_id);
+        auto statement_id = compute_thrift_id(query_string, keyspace);
+        auto it = _thrift_prepared_statements.find(statement_id);
+        if (it == _thrift_prepared_statements.end()) {
+            return ::shared_ptr<result_message::prepared>();
+        }
+        return ::make_shared<result_message::prepared::thrift>(statement_id, it->second);
     } else {
-        return prepare_one<result_message::prepared::cql>(
-                std::move(query_string),
-                client_state,
-                compute_id,
-                prepared_cache_key_type::cql_id);
+        auto statement_id = compute_id(query_string, keyspace);
+        auto it = _prepared_statements.find(statement_id);
+        if (it == _prepared_statements.end()) {
+            return ::shared_ptr<result_message::prepared>();
+        }
+        return ::make_shared<result_message::prepared::cql>(statement_id, it->second);
     }
 }
 
-::shared_ptr<cql_transport::messages::result_message::prepared>
-query_processor::get_stored_prepared_statement(
-        const std::experimental::string_view& query_string,
-        const sstring& keyspace,
-        bool for_thrift) {
-    using namespace cql_transport::messages;
+future<::shared_ptr<transport::messages::result_message::prepared>>
+query_processor::store_prepared_statement(const std::experimental::string_view& query_string,
+                                          const sstring& keyspace,
+                                          ::shared_ptr<statements::prepared_statement> prepared,
+                                          bool for_thrift)
+{
+#if 0
+    // Concatenate the current keyspace so we don't mix prepared statements between keyspace (#5352).
+    // (if the keyspace is null, queryString has to have a fully-qualified keyspace so it's fine.
+    long statementSize = measure(prepared.statement);
+    // don't execute the statement if it's bigger than the allowed threshold
+    if (statementSize > MAX_CACHE_PREPARED_MEMORY)
+        throw new InvalidRequestException(String.format("Prepared statement of size %d bytes is larger than allowed maximum of %d bytes.",
+                                                        statementSize,
+                                                        MAX_CACHE_PREPARED_MEMORY));
+#endif
+    prepared->raw_cql_statement = query_string.data();
     if (for_thrift) {
-        return get_stored_prepared_statement_one<result_message::prepared::thrift>(
-                query_string,
-                keyspace,
-                compute_thrift_id,
-                prepared_cache_key_type::thrift_id);
+        auto statement_id = compute_thrift_id(query_string, keyspace);
+        _thrift_prepared_statements.emplace(statement_id, prepared);
+        auto msg = ::make_shared<result_message::prepared::thrift>(statement_id, prepared);
+        return make_ready_future<::shared_ptr<result_message::prepared>>(std::move(msg));
     } else {
-        return get_stored_prepared_statement_one<result_message::prepared::cql>(
-                query_string,
-                keyspace,
-                compute_id,
-                prepared_cache_key_type::cql_id);
+        auto statement_id = compute_id(query_string, keyspace);
+        _prepared_statements.emplace(statement_id, prepared);
+        auto msg = ::make_shared<result_message::prepared::cql>(statement_id, prepared);
+        return make_ready_future<::shared_ptr<result_message::prepared>>(std::move(msg));
     }
 }
 
-static bytes md5_calculate(const std::experimental::string_view& s) {
+static bytes md5_calculate(const std::experimental::string_view& s)
+{
     constexpr size_t size = CryptoPP::Weak1::MD5::DIGESTSIZE;
     CryptoPP::Weak::MD5 hash;
     unsigned char digest[size];
@@ -288,25 +286,27 @@ static sstring hash_target(const std::experimental::string_view& query_string, c
     return keyspace + query_string.to_string();
 }
 
-prepared_cache_key_type query_processor::compute_id(
-        const std::experimental::string_view& query_string,
-        const sstring& keyspace) {
-    return prepared_cache_key_type(md5_calculate(hash_target(query_string, keyspace)));
+bytes query_processor::compute_id(const std::experimental::string_view& query_string, const sstring& keyspace)
+{
+    return md5_calculate(hash_target(query_string, keyspace));
 }
 
-prepared_cache_key_type query_processor::compute_thrift_id(
-        const std::experimental::string_view& query_string,
-        const sstring& keyspace) {
+int32_t query_processor::compute_thrift_id(const std::experimental::string_view& query_string, const sstring& keyspace)
+{
     auto target = hash_target(query_string, keyspace);
     uint32_t h = 0;
     for (auto&& c : hash_target(query_string, keyspace)) {
         h = 31*h + c;
     }
-    return prepared_cache_key_type(static_cast<int32_t>(h));
+    return static_cast<int32_t>(h);
 }
 
-std::unique_ptr<prepared_statement>
-query_processor::get_statement(const sstring_view& query, const service::client_state& client_state) {
+::shared_ptr<prepared_statement>
+query_processor::get_statement(const sstring_view& query, const service::client_state& client_state)
+{
+#if 0
+        Tracing.trace("Parsing {}", queryStr);
+#endif
     ::shared_ptr<raw::parsed_statement> statement = parse_statement(query);
 
     // Set keyspace for statement that require login
@@ -314,12 +314,16 @@ query_processor::get_statement(const sstring_view& query, const service::client_
     if (cf_stmt) {
         cf_stmt->prepare_keyspace(client_state);
     }
+#if 0
+        Tracing.trace("Preparing statement");
+#endif
     ++_stats.prepare_invocations;
     return statement->prepare(_db.local(), _cql_stats);
 }
 
 ::shared_ptr<raw::parsed_statement>
-query_processor::parse_statement(const sstring_view& query) {
+query_processor::parse_statement(const sstring_view& query)
+{
     try {
         auto statement = util::do_with_parser(query,  std::mem_fn(&cql3_parser::CqlParser::query));
         if (!statement) {
@@ -336,14 +340,12 @@ query_processor::parse_statement(const sstring_view& query) {
     }
 }
 
-query_options query_processor::make_internal_options(
-        const statements::prepared_statement::checked_weak_ptr& p,
-        const std::initializer_list<data_value>& values,
-        db::consistency_level cl,
-        int32_t page_size) {
+query_options query_processor::make_internal_options(::shared_ptr<statements::prepared_statement> p,
+                                                     const std::initializer_list<data_value>& values,
+                                                     db::consistency_level cl)
+{
     if (p->bound_names.size() != values.size()) {
-        throw std::invalid_argument(
-                sprint("Invalid number of values. Expecting %d but got %d", p->bound_names.size(), values.size()));
+        throw std::invalid_argument(sprint("Invalid number of values. Expecting %d but got %d", p->bound_names.size(), values.size()));
     }
     auto ni = p->bound_names.begin();
     std::vector<cql3::raw_value> bound_values;
@@ -357,179 +359,74 @@ query_options query_processor::make_internal_options(
             bound_values.push_back(cql3::raw_value::make_value(n->type->decompose(v)));
         }
     }
-    if (page_size > 0) {
-        ::shared_ptr<service::pager::paging_state> paging_state;
-        db::consistency_level serial_consistency = db::consistency_level::SERIAL;
-        api::timestamp_type ts = api::missing_timestamp;
-        return query_options(
-                cl,
-                bound_values,
-                cql3::query_options::specific_options{page_size, std::move(paging_state), serial_consistency, ts});
-    }
     return query_options(cl, bound_values);
 }
 
-statements::prepared_statement::checked_weak_ptr query_processor::prepare_internal(const sstring& query_string) {
+::shared_ptr<statements::prepared_statement> query_processor::prepare_internal(const sstring& query_string)
+{
     auto& p = _internal_statements[query_string];
     if (p == nullptr) {
         auto np = parse_statement(query_string)->prepare(_db.local(), _cql_stats);
         np->statement->validate(_proxy, *_internal_state);
         p = std::move(np); // inserts it into map
     }
-    return p->checked_weak_from_this();
+    return p;
 }
 
 future<::shared_ptr<untyped_result_set>>
-query_processor::execute_internal(const sstring& query_string, const std::initializer_list<data_value>& values) {
+query_processor::execute_internal(const sstring& query_string,
+                                  const std::initializer_list<data_value>& values)
+{
     if (log.is_enabled(logging::log_level::trace)) {
         log.trace("execute_internal: \"{}\" ({})", query_string, ::join(", ", values));
     }
-    return execute_internal(prepare_internal(query_string), values);
-}
-
-struct internal_query_state {
-    sstring query_string;
-    std::unique_ptr<query_options> opts;
-    statements::prepared_statement::checked_weak_ptr p;
-    bool more_results = true;
-};
-
-::shared_ptr<internal_query_state> query_processor::create_paged_state(const sstring& query_string,
-        const std::initializer_list<data_value>& values, int32_t page_size) {
     auto p = prepare_internal(query_string);
-    auto opts = make_internal_options(p, values, db::consistency_level::ONE, page_size);
-    ::shared_ptr<internal_query_state> res = ::make_shared<internal_query_state>(
-            internal_query_state{
-                    query_string,
-                    std::make_unique<cql3::query_options>(std::move(opts)), std::move(p),
-                    true});
-    return res;
-}
-
-bool query_processor::has_more_results(::shared_ptr<cql3::internal_query_state> state) const {
-    if (state) {
-        return state->more_results;
-    }
-    return false;
-}
-
-future<> query_processor::for_each_cql_result(
-        ::shared_ptr<cql3::internal_query_state> state,
-        std::function<stop_iteration(const cql3::untyped_result_set::row&)>&& f) {
-    return do_with(seastar::shared_ptr<bool>(), [f, this, state](auto& is_done) mutable {
-        is_done = seastar::make_shared<bool>(false);
-
-        auto stop_when = [is_done]() {
-            return *is_done;
-        };
-        auto do_resuls = [is_done, state, f, this]() mutable {
-            return this->execute_paged_internal(
-                    state).then([is_done, state, f, this](::shared_ptr<cql3::untyped_result_set> msg) mutable {
-                if (msg->empty()) {
-                    *is_done = true;
-                } else {
-                    if (!this->has_more_results(state)) {
-                        *is_done = true;
-                    }
-                    for (auto& row : *msg) {
-                        if (f(row) == stop_iteration::yes) {
-                            *is_done = true;
-                            break;
-                        }
-                    }
-                }
-            });
-        };
-        return do_until(stop_when, do_resuls);
-    });
+    return execute_internal(p, values);
 }
 
 future<::shared_ptr<untyped_result_set>>
-query_processor::execute_paged_internal(::shared_ptr<internal_query_state> state) {
-    return state->p->statement->execute_internal(_proxy, *_internal_state, *state->opts).then(
-            [state, this](::shared_ptr<cql_transport::messages::result_message> msg) mutable {
-        class visitor : public result_message::visitor_base {
-            ::shared_ptr<internal_query_state> _state;
-            query_processor& _qp;
-        public:
-            visitor(::shared_ptr<internal_query_state> state, query_processor& qp) : _state(state), _qp(qp) {
-            }
-            virtual ~visitor() = default;
-            void visit(const result_message::rows& rmrs) override {
-                auto& rs = rmrs.rs();
-                if (rs.get_metadata().paging_state()) {
-                    bool done = !rs.get_metadata().flags().contains<cql3::metadata::flag::HAS_MORE_PAGES>();
-
-                    if (done) {
-                        _state->more_results = false;
-                    } else {
-                        const service::pager::paging_state& st = *rs.get_metadata().paging_state();
-                        shared_ptr<service::pager::paging_state> shrd = ::make_shared<service::pager::paging_state>(st);
-                        _state->opts = std::make_unique<query_options>(std::move(_state->opts), shrd);
-                        _state->p = _qp.prepare_internal(_state->query_string);
-                    }
-                } else {
-                    _state->more_results = false;
-                }
-            }
-        };
-        visitor v(state, *this);
-        if (msg != nullptr) {
-            msg->accept(v);
-        }
-        return make_ready_future<::shared_ptr<untyped_result_set>>(::make_shared<untyped_result_set>(msg));
-    });
-}
-
-future<::shared_ptr<untyped_result_set>>
-query_processor::execute_internal(
-        statements::prepared_statement::checked_weak_ptr p,
-        const std::initializer_list<data_value>& values) {
-    query_options opts = make_internal_options(p, values);
+query_processor::execute_internal(::shared_ptr<statements::prepared_statement> p,
+                                  const std::initializer_list<data_value>& values)
+{
+    auto opts = make_internal_options(p, values);
     return do_with(std::move(opts), [this, p = std::move(p)](auto& opts) {
-        return p->statement->execute_internal(
-                _proxy,
-                *_internal_state,
-                opts).then([&opts, stmt = p->statement](auto msg) {
+        return p->statement->execute_internal(_proxy, *_internal_state, opts).then([p](auto msg) {
             return make_ready_future<::shared_ptr<untyped_result_set>>(::make_shared<untyped_result_set>(msg));
         });
     });
 }
 
 future<::shared_ptr<untyped_result_set>>
-query_processor::process(
-        const sstring& query_string,
-        db::consistency_level cl,
-        const std::initializer_list<data_value>& values,
-        bool cache) {
-    if (cache) {
-        return process(prepare_internal(query_string), cl, values);
-    } else {
-        auto p = parse_statement(query_string)->prepare(_db.local(), _cql_stats);
+query_processor::process(const sstring& query_string,
+                         db::consistency_level cl,
+                         const std::initializer_list<data_value>& values,
+                         bool cache)
+{
+    auto p = cache ? prepare_internal(query_string) : parse_statement(query_string)->prepare(_db.local(), _cql_stats);
+    if (!cache) {
         p->statement->validate(_proxy, *_internal_state);
-        auto checked_weak_ptr = p->checked_weak_from_this();
-        return process(std::move(checked_weak_ptr), cl, values).finally([p = std::move(p)] {});
     }
+    return process(p, cl, values);
 }
 
 future<::shared_ptr<untyped_result_set>>
-query_processor::process(
-        statements::prepared_statement::checked_weak_ptr p,
-        db::consistency_level cl,
-        const std::initializer_list<data_value>& values) {
+query_processor::process(::shared_ptr<statements::prepared_statement> p,
+                         db::consistency_level cl,
+                         const std::initializer_list<data_value>& values)
+{
     auto opts = make_internal_options(p, values, cl);
     return do_with(std::move(opts), [this, p = std::move(p)](auto & opts) {
-        return p->statement->execute(_proxy, *_internal_state, opts).then([](auto msg) {
+        return p->statement->execute(_proxy, *_internal_state, opts).then([p](auto msg) {
             return make_ready_future<::shared_ptr<untyped_result_set>>(::make_shared<untyped_result_set>(msg));
         });
     });
 }
 
-future<::shared_ptr<cql_transport::messages::result_message>>
-query_processor::process_batch(
-        ::shared_ptr<statements::batch_statement> batch,
-        service::query_state& query_state,
-        query_options& options) {
+future<::shared_ptr<transport::messages::result_message>>
+query_processor::process_batch(::shared_ptr<statements::batch_statement> batch,
+                               service::query_state& query_state,
+                               query_options& options)
+{
     return batch->check_access(query_state.get_client_state()).then([this, &query_state, &options, batch] {
         batch->validate();
         batch->validate(_proxy, query_state.get_client_state());
@@ -537,90 +434,101 @@ query_processor::process_batch(
     });
 }
 
-query_processor::migration_subscriber::migration_subscriber(query_processor* qp) : _qp{qp} {
+query_processor::migration_subscriber::migration_subscriber(query_processor* qp)
+    : _qp{qp}
+{
 }
 
-void query_processor::migration_subscriber::on_create_keyspace(const sstring& ks_name) {
+void query_processor::migration_subscriber::on_create_keyspace(const sstring& ks_name)
+{
 }
 
-void query_processor::migration_subscriber::on_create_column_family(const sstring& ks_name, const sstring& cf_name) {
+void query_processor::migration_subscriber::on_create_column_family(const sstring& ks_name, const sstring& cf_name)
+{
 }
 
-void query_processor::migration_subscriber::on_create_user_type(const sstring& ks_name, const sstring& type_name) {
+void query_processor::migration_subscriber::on_create_user_type(const sstring& ks_name, const sstring& type_name)
+{
 }
 
-void query_processor::migration_subscriber::on_create_function(const sstring& ks_name, const sstring& function_name) {
+void query_processor::migration_subscriber::on_create_function(const sstring& ks_name, const sstring& function_name)
+{
     log.warn("{} event ignored", __func__);
 }
 
-void query_processor::migration_subscriber::on_create_aggregate(const sstring& ks_name, const sstring& aggregate_name) {
+void query_processor::migration_subscriber::on_create_aggregate(const sstring& ks_name, const sstring& aggregate_name)
+{
     log.warn("{} event ignored", __func__);
 }
 
-void query_processor::migration_subscriber::on_create_view(const sstring& ks_name, const sstring& view_name) {
+void query_processor::migration_subscriber::on_create_view(const sstring& ks_name, const sstring& view_name)
+{
 }
 
-void query_processor::migration_subscriber::on_update_keyspace(const sstring& ks_name) {
+void query_processor::migration_subscriber::on_update_keyspace(const sstring& ks_name)
+{
 }
 
-void query_processor::migration_subscriber::on_update_column_family(
-        const sstring& ks_name,
-        const sstring& cf_name,
-        bool columns_changed) {
+void query_processor::migration_subscriber::on_update_column_family(const sstring& ks_name, const sstring& cf_name, bool columns_changed)
+{
     // #1255: Ignoring columns_changed deliberately.
     log.info("Column definitions for {}.{} changed, invalidating related prepared statements", ks_name, cf_name);
     remove_invalid_prepared_statements(ks_name, cf_name);
 }
 
-void query_processor::migration_subscriber::on_update_user_type(const sstring& ks_name, const sstring& type_name) {
+void query_processor::migration_subscriber::on_update_user_type(const sstring& ks_name, const sstring& type_name)
+{
 }
 
-void query_processor::migration_subscriber::on_update_function(const sstring& ks_name, const sstring& function_name) {
+void query_processor::migration_subscriber::on_update_function(const sstring& ks_name, const sstring& function_name)
+{
 }
 
-void query_processor::migration_subscriber::on_update_aggregate(const sstring& ks_name, const sstring& aggregate_name) {
+void query_processor::migration_subscriber::on_update_aggregate(const sstring& ks_name, const sstring& aggregate_name)
+{
 }
 
-void query_processor::migration_subscriber::on_update_view(
-        const sstring& ks_name,
-        const sstring& view_name, bool columns_changed) {
+void query_processor::migration_subscriber::on_update_view(const sstring& ks_name, const sstring& view_name, bool columns_changed)
+{
 }
 
-void query_processor::migration_subscriber::on_drop_keyspace(const sstring& ks_name) {
+void query_processor::migration_subscriber::on_drop_keyspace(const sstring& ks_name)
+{
     remove_invalid_prepared_statements(ks_name, std::experimental::nullopt);
 }
 
-void query_processor::migration_subscriber::on_drop_column_family(const sstring& ks_name, const sstring& cf_name) {
+void query_processor::migration_subscriber::on_drop_column_family(const sstring& ks_name, const sstring& cf_name)
+{
     remove_invalid_prepared_statements(ks_name, cf_name);
 }
 
-void query_processor::migration_subscriber::on_drop_user_type(const sstring& ks_name, const sstring& type_name) {
+void query_processor::migration_subscriber::on_drop_user_type(const sstring& ks_name, const sstring& type_name)
+{
 }
 
-void query_processor::migration_subscriber::on_drop_function(const sstring& ks_name, const sstring& function_name) {
+void query_processor::migration_subscriber::on_drop_function(const sstring& ks_name, const sstring& function_name)
+{
     log.warn("{} event ignored", __func__);
 }
 
-void query_processor::migration_subscriber::on_drop_aggregate(const sstring& ks_name, const sstring& aggregate_name) {
+void query_processor::migration_subscriber::on_drop_aggregate(const sstring& ks_name, const sstring& aggregate_name)
+{
     log.warn("{} event ignored", __func__);
 }
 
-void query_processor::migration_subscriber::on_drop_view(const sstring& ks_name, const sstring& view_name) {
-    remove_invalid_prepared_statements(ks_name, view_name);
+void query_processor::migration_subscriber::on_drop_view(const sstring& ks_name, const sstring& view_name)
+{
 }
 
-void query_processor::migration_subscriber::remove_invalid_prepared_statements(
-        sstring ks_name,
-        std::experimental::optional<sstring> cf_name) {
-    _qp->_prepared_cache.remove_if([&] (::shared_ptr<cql_statement> stmt) {
+void query_processor::migration_subscriber::remove_invalid_prepared_statements(sstring ks_name, std::experimental::optional<sstring> cf_name)
+{
+    _qp->invalidate_prepared_statements([&] (::shared_ptr<cql_statement> stmt) {
         return this->should_invalidate(ks_name, cf_name, stmt);
     });
 }
 
-bool query_processor::migration_subscriber::should_invalidate(
-        sstring ks_name,
-        std::experimental::optional<sstring> cf_name,
-        ::shared_ptr<cql_statement> statement) {
+bool query_processor::migration_subscriber::should_invalidate(sstring ks_name, std::experimental::optional<sstring> cf_name, ::shared_ptr<cql_statement> statement)
+{
     return statement->depends_on_keyspace(ks_name) && (!cf_name || statement->depends_on_column_family(*cf_name));
 }
 

cql3/query_processor.hh

@@ -43,22 +43,20 @@
 
 #include <experimental/string_view>
 #include <unordered_map>
-
-#include <seastar/core/distributed.hh>
 #include <seastar/core/metrics_registration.hh>
-#include <seastar/core/shared_ptr.hh>
 
-#include "cql3/prepared_statements_cache.hh"
+#include "core/shared_ptr.hh"
+#include "exceptions/exceptions.hh"
 #include "cql3/query_options.hh"
-#include "cql3/statements/prepared_statement.hh"
 #include "cql3/statements/raw/parsed_statement.hh"
 #include "cql3/statements/raw/cf_statement.hh"
-#include "cql3/untyped_result_set.hh"
-#include "exceptions/exceptions.hh"
-#include "log.hh"
 #include "service/migration_manager.hh"
 #include "service/query_state.hh"
+#include "log.hh"
+#include "core/distributed.hh"
+#include "statements/prepared_statement.hh"
 #include "transport/messages/result_message.hh"
+#include "untyped_result_set.hh"
 
 namespace cql3 {
 
@@ -66,40 +64,9 @@ namespace statements {
 class batch_statement;
 }
 
-class untyped_result_set;
-class untyped_result_set_row;
-
-/*!
- * \brief to allow paging, holds
- * internal state, that needs to be passed to the execute statement.
- *
- */
-struct internal_query_state;
-
-class prepared_statement_is_too_big : public std::exception {
-    sstring _msg;
-
-public:
-    static constexpr int max_query_prefix = 100;
-
-    prepared_statement_is_too_big(const sstring& query_string)
-        : _msg(seastar::format("Prepared statement is too big: {}", query_string.substr(0, max_query_prefix)))
-    {
-        // mark that we clipped the query string
-        if (query_string.size() > max_query_prefix) {
-            _msg += "...";
-        }
-    }
-
-    virtual const char* what() const noexcept override {
-        return _msg.c_str();
-    }
-};
-
 class query_processor {
 public:
     class migration_subscriber;
-
 private:
     std::unique_ptr<migration_subscriber> _migration_subscriber;
     distributed<service::storage_proxy>& _proxy;
@@ -116,33 +83,15 @@ private:
     class internal_state;
     std::unique_ptr<internal_state> _internal_state;
 
-    prepared_statements_cache _prepared_cache;
-
-    // A map for prepared statements used internally (which we don't want to mix with user statement, in particular we
-    // don't bother with expiration on those.
-    std::unordered_map<sstring, std::unique_ptr<statements::prepared_statement>> _internal_statements;
-
 public:
-    static const sstring CQL_VERSION;
-
-    static prepared_cache_key_type compute_id(
-            const std::experimental::string_view& query_string,
-            const sstring& keyspace);
-
-    static prepared_cache_key_type compute_thrift_id(
-            const std::experimental::string_view& query_string,
-            const sstring& keyspace);
-
-    static ::shared_ptr<statements::raw::parsed_statement> parse_statement(const std::experimental::string_view& query);
-
     query_processor(distributed<service::storage_proxy>& proxy, distributed<database>& db);
-
     ~query_processor();
 
+    static const sstring CQL_VERSION;
+
     distributed<database>& db() {
         return _db;
     }
-
     distributed<service::storage_proxy>& proxy() {
         return _proxy;
     }
@@ -151,78 +100,265 @@ public:
         return _cql_stats;
     }
 
-    statements::prepared_statement::checked_weak_ptr get_prepared(const prepared_cache_key_type& key) {
-        auto it = _prepared_cache.find(key);
-        if (it == _prepared_cache.end()) {
-            return statements::prepared_statement::checked_weak_ptr();
+#if 0
+    public static final QueryProcessor instance = new QueryProcessor();
+#endif
+private:
+#if 0
+    private static final Logger logger = LoggerFactory.getLogger(QueryProcessor.class);
+    private static final MemoryMeter meter = new MemoryMeter().withGuessing(MemoryMeter.Guess.FALLBACK_BEST).ignoreKnownSingletons();
+    private static final long MAX_CACHE_PREPARED_MEMORY = Runtime.getRuntime().maxMemory() / 256;
+
+    private static EntryWeigher<MD5Digest, ParsedStatement.Prepared> cqlMemoryUsageWeigher = new EntryWeigher<MD5Digest, ParsedStatement.Prepared>()
+    {
+        @Override
+        public int weightOf(MD5Digest key, ParsedStatement.Prepared value)
+        {
+            return Ints.checkedCast(measure(key) + measure(value.statement) + measure(value.boundNames));
         }
-        return *it;
+    };
+
+    private static EntryWeigher<Integer, ParsedStatement.Prepared> thriftMemoryUsageWeigher = new EntryWeigher<Integer, ParsedStatement.Prepared>()
+    {
+        @Override
+        public int weightOf(Integer key, ParsedStatement.Prepared value)
+        {
+            return Ints.checkedCast(measure(key) + measure(value.statement) + measure(value.boundNames));
+        }
+    };
+#endif
+
+    std::unordered_map<bytes, ::shared_ptr<statements::prepared_statement>> _prepared_statements;
+    std::unordered_map<int32_t, ::shared_ptr<statements::prepared_statement>> _thrift_prepared_statements;
+    std::unordered_map<sstring, ::shared_ptr<statements::prepared_statement>> _internal_statements;
+#if 0
+
+    // A map for prepared statements used internally (which we don't want to mix with user statement, in particular we don't
+    // bother with expiration on those.
+    private static final ConcurrentMap<String, ParsedStatement.Prepared> internalStatements = new ConcurrentHashMap<>();
+
+    // Direct calls to processStatement do not increment the preparedStatementsExecuted/regularStatementsExecuted
+    // counters. Callers of processStatement are responsible for correctly notifying metrics
+    public static final CQLMetrics metrics = new CQLMetrics();
+
+    private static final AtomicInteger lastMinuteEvictionsCount = new AtomicInteger(0);
+
+    static
+    {
+        preparedStatements = new ConcurrentLinkedHashMap.Builder<MD5Digest, ParsedStatement.Prepared>()
+                             .maximumWeightedCapacity(MAX_CACHE_PREPARED_MEMORY)
+                             .weigher(cqlMemoryUsageWeigher)
+                             .listener(new EvictionListener<MD5Digest, ParsedStatement.Prepared>()
+                             {
+                                 public void onEviction(MD5Digest md5Digest, ParsedStatement.Prepared prepared)
+                                 {
+                                     metrics.preparedStatementsEvicted.inc();
+                                     lastMinuteEvictionsCount.incrementAndGet();
+                                 }
+                             }).build();
+
+        thriftPreparedStatements = new ConcurrentLinkedHashMap.Builder<Integer, ParsedStatement.Prepared>()
+                                   .maximumWeightedCapacity(MAX_CACHE_PREPARED_MEMORY)
+                                   .weigher(thriftMemoryUsageWeigher)
+                                   .listener(new EvictionListener<Integer, ParsedStatement.Prepared>()
+                                   {
+                                       public void onEviction(Integer integer, ParsedStatement.Prepared prepared)
+                                       {
+                                           metrics.preparedStatementsEvicted.inc();
+                                           lastMinuteEvictionsCount.incrementAndGet();
+                                       }
+                                   })
+                                   .build();
+
+        ScheduledExecutors.scheduledTasks.scheduleAtFixedRate(new Runnable()
+        {
+            public void run()
+            {
+                long count = lastMinuteEvictionsCount.getAndSet(0);
+                if (count > 0)
+                    logger.info("{} prepared statements discarded in the last minute because cache limit reached ({} bytes)",
+                                count,
+                                MAX_CACHE_PREPARED_MEMORY);
+            }
+        }, 1, 1, TimeUnit.MINUTES);
     }
 
-    future<::shared_ptr<cql_transport::messages::result_message>>
-    process_statement(
-            ::shared_ptr<cql_statement> statement,
-            service::query_state& query_state,
-            const query_options& options);
-
-    future<::shared_ptr<cql_transport::messages::result_message>>
-    process(
-            const std::experimental::string_view& query_string,
-            service::query_state& query_state,
-            query_options& options);
-
-    future<::shared_ptr<untyped_result_set>>
-    execute_internal(const sstring& query_string, const std::initializer_list<data_value>& = { });
-
-    statements::prepared_statement::checked_weak_ptr prepare_internal(const sstring& query);
-
-    future<::shared_ptr<untyped_result_set>>
-    execute_internal(statements::prepared_statement::checked_weak_ptr p, const std::initializer_list<data_value>& = { });
-
-    /*!
-     * \brief iterate over all cql results using paging
-     *
-     * You Create a statement with optional paraemter and pass
-     * a function that goes over the results.
-     *
-     * The passed function would be called for all the results, return stop_iteration::yes
-     * to stop during iteration.
-     *
-     * For example:
-            return query("SELECT * from system.compaction_history",
-                         [&history] (const cql3::untyped_result_set::row& row) mutable {
-                ....
-                ....
-                return stop_iteration::no;
-            });
-
-     * You can use place holder in the query, the prepared statement will only be done once.
-     *
-     *
-     * query_string - the cql string, can contain place holder
-     * f - a function to be run on each of the query result, if the function return false the iteration would stop
-     * args - arbitrary number of query parameters
-     */
-    template<typename... Args>
-    future<> query(
-            const sstring& query_string,
-            std::function<stop_iteration(const cql3::untyped_result_set_row&)>&& f,
-            Args&&... args) {
-        return for_each_cql_result(
-                create_paged_state(query_string, { data_value(std::forward<Args>(args))... }), std::move(f));
+    public static int preparedStatementsCount()
+    {
+        return preparedStatements.size() + thriftPreparedStatements.size();
     }
 
-    future<::shared_ptr<untyped_result_set>> process(
-            const sstring& query_string,
-            db::consistency_level,
-            const std::initializer_list<data_value>& = { },
-            bool cache = false);
+    // Work around initialization dependency
+    private static enum InternalStateInstance
+    {
+        INSTANCE;
 
-    future<::shared_ptr<untyped_result_set>> process(
-            statements::prepared_statement::checked_weak_ptr p,
-            db::consistency_level,
+        private final QueryState queryState;
+
+        InternalStateInstance()
+        {
+            ClientState state = ClientState.forInternalCalls();
+            try
+            {
+                state.setKeyspace(SystemKeyspace.NAME);
+            }
+            catch (InvalidRequestException e)
+            {
+                throw new RuntimeException();
+            }
+            this.queryState = new QueryState(state);
+        }
+    }
+
+    private static QueryState internalQueryState()
+    {
+        return InternalStateInstance.INSTANCE.queryState;
+    }
+
+    private QueryProcessor()
+    {
+        MigrationManager.instance.register(new MigrationSubscriber());
+    }
+#endif
+public:
+    ::shared_ptr<statements::prepared_statement> get_prepared(const bytes& id) {
+        auto it = _prepared_statements.find(id);
+        if (it == _prepared_statements.end()) {
+            return ::shared_ptr<statements::prepared_statement>{};
+        }
+        return it->second;
+    }
+
+    ::shared_ptr<statements::prepared_statement> get_prepared_for_thrift(int32_t id) {
+        auto it = _thrift_prepared_statements.find(id);
+        if (it == _thrift_prepared_statements.end()) {
+            return ::shared_ptr<statements::prepared_statement>{};
+        }
+        return it->second;
+    }
+#if 0
+    public static void validateKey(ByteBuffer key) throws InvalidRequestException
+    {
+        if (key == null || key.remaining() == 0)
+        {
+            throw new InvalidRequestException("Key may not be empty");
+        }
+
+        // check that key can be handled by FBUtilities.writeShortByteArray
+        if (key.remaining() > FBUtilities.MAX_UNSIGNED_SHORT)
+        {
+            throw new InvalidRequestException("Key length of " + key.remaining() +
+                                              " is longer than maximum of " + FBUtilities.MAX_UNSIGNED_SHORT);
+        }
+    }
+
+    public static void validateCellNames(Iterable<CellName> cellNames, CellNameType type) throws InvalidRequestException
+    {
+        for (CellName name : cellNames)
+            validateCellName(name, type);
+    }
+
+    public static void validateCellName(CellName name, CellNameType type) throws InvalidRequestException
+    {
+        validateComposite(name, type);
+        if (name.isEmpty())
+            throw new InvalidRequestException("Invalid empty value for clustering column of COMPACT TABLE");
+    }
+
+    public static void validateComposite(Composite name, CType type) throws InvalidRequestException
+    {
+        long serializedSize = type.serializer().serializedSize(name, TypeSizes.NATIVE);
+        if (serializedSize > Cell.MAX_NAME_LENGTH)
+            throw new InvalidRequestException(String.format("The sum of all clustering columns is too long (%s > %s)",
+                                                            serializedSize,
+                                                            Cell.MAX_NAME_LENGTH));
+    }
+#endif
+public:
+    future<::shared_ptr<transport::messages::result_message>> process_statement(::shared_ptr<cql_statement> statement,
+            service::query_state& query_state, const query_options& options);
+
+#if 0
+    public static ResultMessage process(String queryString, ConsistencyLevel cl, QueryState queryState)
+    throws RequestExecutionException, RequestValidationException
+    {
+        return instance.process(queryString, queryState, QueryOptions.forInternalCalls(cl, Collections.<ByteBuffer>emptyList()));
+    }
+#endif
+
+    future<::shared_ptr<transport::messages::result_message>> process(const std::experimental::string_view& query_string,
+            service::query_state& query_state, query_options& options);
+
+#if 0
+    public static ParsedStatement.Prepared parseStatement(String queryStr, QueryState queryState) throws RequestValidationException
+    {
+        return getStatement(queryStr, queryState.getClientState());
+    }
+
+    public static UntypedResultSet process(String query, ConsistencyLevel cl) throws RequestExecutionException
+    {
+        try
+        {
+            ResultMessage result = instance.process(query, QueryState.forInternalCalls(), QueryOptions.forInternalCalls(cl, Collections.<ByteBuffer>emptyList()));
+            if (result instanceof ResultMessage.Rows)
+                return UntypedResultSet.create(((ResultMessage.Rows)result).result);
+            else
+                return null;
+        }
+        catch (RequestValidationException e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static QueryOptions makeInternalOptions(ParsedStatement.Prepared prepared, Object[] values)
+    {
+        if (prepared.boundNames.size() != values.length)
+            throw new IllegalArgumentException(String.format("Invalid number of values. Expecting %d but got %d", prepared.boundNames.size(), values.length));
+
+        List<ByteBuffer> boundValues = new ArrayList<ByteBuffer>(values.length);
+        for (int i = 0; i < values.length; i++)
+        {
+            Object value = values[i];
+            AbstractType type = prepared.boundNames.get(i).type;
+            boundValues.add(value instanceof ByteBuffer || value == null ? (ByteBuffer)value : type.decompose(value));
+        }
+        return QueryOptions.forInternalCalls(boundValues);
+    }
+
+    private static ParsedStatement.Prepared prepareInternal(String query) throws RequestValidationException
+    {
+        ParsedStatement.Prepared prepared = internalStatements.get(query);
+        if (prepared != null)
+            return prepared;
+
+        // Note: if 2 threads prepare the same query, we'll live so don't bother synchronizing
+        prepared = parseStatement(query, internalQueryState());
+        prepared.statement.validate(internalQueryState().getClientState());
+        internalStatements.putIfAbsent(query, prepared);
+        return prepared;
+    }
+#endif
+private:
+    query_options make_internal_options(::shared_ptr<statements::prepared_statement>, const std::initializer_list<data_value>&, db::consistency_level = db::consistency_level::ONE);
+public:
+    future<::shared_ptr<untyped_result_set>> execute_internal(
+            const sstring& query_string,
             const std::initializer_list<data_value>& = { });
 
+    ::shared_ptr<statements::prepared_statement> prepare_internal(const sstring& query);
+
+    future<::shared_ptr<untyped_result_set>> execute_internal(
+            ::shared_ptr<statements::prepared_statement>,
+            const std::initializer_list<data_value>& = { });
+
+    future<::shared_ptr<untyped_result_set>> process(
+                    const sstring& query_string,
+                    db::consistency_level, const std::initializer_list<data_value>& = { }, bool cache = false);
+    future<::shared_ptr<untyped_result_set>> process(
+                    ::shared_ptr<statements::prepared_statement>,
+                    db::consistency_level, const std::initializer_list<data_value>& = { });
+
     /*
      * This function provides a timestamp that is guaranteed to be higher than any timestamp
      * previously used in internal queries.
@@ -233,129 +369,155 @@ public:
      */
     api::timestamp_type next_timestamp();
 
-    future<::shared_ptr<cql_transport::messages::result_message::prepared>>
-    prepare(sstring query_string, service::query_state& query_state);
+#if 0
+    public static UntypedResultSet executeInternalWithPaging(String query, int pageSize, Object... values)
+    {
+        try
+        {
+            ParsedStatement.Prepared prepared = prepareInternal(query);
+            if (!(prepared.statement instanceof SelectStatement))
+                throw new IllegalArgumentException("Only SELECTs can be paged");
 
-    future<::shared_ptr<cql_transport::messages::result_message::prepared>>
-    prepare(sstring query_string, const service::client_state& client_state, bool for_thrift);
-
-    future<> stop();
-
-    future<::shared_ptr<cql_transport::messages::result_message>>
-    process_batch(::shared_ptr<statements::batch_statement>, service::query_state& query_state, query_options& options);
-
-    std::unique_ptr<statements::prepared_statement> get_statement(
-            const std::experimental::string_view& query,
-            const service::client_state& client_state);
-
-    friend class migration_subscriber;
-
-private:
-    query_options make_internal_options(
-            const statements::prepared_statement::checked_weak_ptr& p,
-            const std::initializer_list<data_value>&,
-            db::consistency_level = db::consistency_level::ONE,
-            int32_t page_size = -1);
-
-    /*!
-     * \brief created a state object for paging
-     *
-     * When using paging internally a state object is needed.
-     */
-    ::shared_ptr<internal_query_state> create_paged_state(
-            const sstring& query_string,
-            const std::initializer_list<data_value>& = { },
-            int32_t page_size = 1000);
-
-    /*!
-     * \brief run a query using paging
-     */
-    future<::shared_ptr<untyped_result_set>> execute_paged_internal(::shared_ptr<internal_query_state> state);
-
-    /*!
-     * \brief iterate over all results using paging
-     */
-    future<> for_each_cql_result(
-            ::shared_ptr<cql3::internal_query_state> state,
-            std::function<stop_iteration(const cql3::untyped_result_set_row&)>&& f);
-
-    /*!
-     * \brief check, based on the state if there are additional results
-     * Users of the paging, should not use the internal_query_state directly
-     */
-    bool has_more_results(::shared_ptr<cql3::internal_query_state> state) const;
-
-    ///
-    /// \tparam ResultMsgType type of the returned result message (CQL or Thrift)
-    /// \tparam PreparedKeyGenerator a function that generates the prepared statement cache key for given query and
-    ///         keyspace
-    /// \tparam IdGetter a function that returns the corresponding prepared statement ID (CQL or Thrift) for a given
-    ////        prepared statement cache key
-    /// \param query_string
-    /// \param client_state
-    /// \param id_gen prepared ID generator, called before the first deferring
-    /// \param id_getter prepared ID getter, passed to deferred context by reference. The caller must ensure its
-    ////       liveness.
-    /// \return
-    template <typename ResultMsgType, typename PreparedKeyGenerator, typename IdGetter>
-    future<::shared_ptr<cql_transport::messages::result_message::prepared>>
-    prepare_one(
-            sstring query_string,
-            const service::client_state& client_state,
-            PreparedKeyGenerator&& id_gen,
-            IdGetter&& id_getter) {
-        return do_with(
-                id_gen(query_string, client_state.get_raw_keyspace()),
-                std::move(query_string),
-                [this, &client_state, &id_getter](const prepared_cache_key_type& key, const sstring& query_string) {
-            return _prepared_cache.get(key, [this, &query_string, &client_state] {
-                auto prepared = get_statement(query_string, client_state);
-                auto bound_terms = prepared->statement->get_bound_terms();
-                if (bound_terms > std::numeric_limits<uint16_t>::max()) {
-                    throw exceptions::invalid_request_exception(
-                            sprint("Too many markers(?). %d markers exceed the allowed maximum of %d",
-                                   bound_terms,
-                                   std::numeric_limits<uint16_t>::max()));
-                }
-                assert(bound_terms == prepared->bound_names.size());
-                prepared->raw_cql_statement = query_string;
-                return make_ready_future<std::unique_ptr<statements::prepared_statement>>(std::move(prepared));
-            }).then([&key, &id_getter] (auto prep_ptr) {
-                return make_ready_future<::shared_ptr<cql_transport::messages::result_message::prepared>>(
-                        ::make_shared<ResultMsgType>(id_getter(key), std::move(prep_ptr)));
-            }).handle_exception_type([&query_string] (typename prepared_statements_cache::statement_is_too_big&) {
-                return make_exception_future<::shared_ptr<cql_transport::messages::result_message::prepared>>(
-                        prepared_statement_is_too_big(query_string));
-            });
-        });
-    };
-
-    template <typename ResultMsgType, typename KeyGenerator, typename IdGetter>
-    ::shared_ptr<cql_transport::messages::result_message::prepared>
-    get_stored_prepared_statement_one(
-            const std::experimental::string_view& query_string,
-            const sstring& keyspace,
-            KeyGenerator&& key_gen,
-            IdGetter&& id_getter) {
-        auto cache_key = key_gen(query_string, keyspace);
-        auto it = _prepared_cache.find(cache_key);
-        if (it == _prepared_cache.end()) {
-            return ::shared_ptr<cql_transport::messages::result_message::prepared>();
+            SelectStatement select = (SelectStatement)prepared.statement;
+            QueryPager pager = QueryPagers.localPager(select.getPageableCommand(makeInternalOptions(prepared, values)));
+            return UntypedResultSet.create(select, pager, pageSize);
+        }
+        catch (RequestValidationException e)
+        {
+            throw new RuntimeException("Error validating query" + e);
         }
-
-        return ::make_shared<ResultMsgType>(id_getter(cache_key), *it);
     }
 
-    ::shared_ptr<cql_transport::messages::result_message::prepared>
-    get_stored_prepared_statement(
-            const std::experimental::string_view& query_string,
-            const sstring& keyspace,
-            bool for_thrift);
+    /**
+     * Same than executeInternal, but to use for queries we know are only executed once so that the
+     * created statement object is not cached.
+     */
+    public static UntypedResultSet executeOnceInternal(String query, Object... values)
+    {
+        try
+        {
+            ParsedStatement.Prepared prepared = parseStatement(query, internalQueryState());
+            prepared.statement.validate(internalQueryState().getClientState());
+            ResultMessage result = prepared.statement.executeInternal(internalQueryState(), makeInternalOptions(prepared, values));
+            if (result instanceof ResultMessage.Rows)
+                return UntypedResultSet.create(((ResultMessage.Rows)result).result);
+            else
+                return null;
+        }
+        catch (RequestExecutionException e)
+        {
+            throw new RuntimeException(e);
+        }
+        catch (RequestValidationException e)
+        {
+            throw new RuntimeException("Error validating query " + query, e);
+        }
+    }
+
+    public static UntypedResultSet resultify(String query, Row row)
+    {
+        return resultify(query, Collections.singletonList(row));
+    }
+
+    public static UntypedResultSet resultify(String query, List<Row> rows)
+    {
+        try
+        {
+            SelectStatement ss = (SelectStatement) getStatement(query, null).statement;
+            ResultSet cqlRows = ss.process(rows);
+            return UntypedResultSet.create(cqlRows);
+        }
+        catch (RequestValidationException e)
+        {
+            throw new AssertionError(e);
+        }
+    }
+#endif
+
+    future<::shared_ptr<transport::messages::result_message::prepared>>
+    prepare(const std::experimental::string_view& query_string, service::query_state& query_state);
+
+    future<::shared_ptr<transport::messages::result_message::prepared>>
+    prepare(const std::experimental::string_view& query_string, const service::client_state& client_state, bool for_thrift);
+
+    static bytes compute_id(const std::experimental::string_view& query_string, const sstring& keyspace);
+    static int32_t compute_thrift_id(const std::experimental::string_view& query_string, const sstring& keyspace);
+
+private:
+    ::shared_ptr<transport::messages::result_message::prepared>
+    get_stored_prepared_statement(const std::experimental::string_view& query_string, const sstring& keyspace, bool for_thrift);
+
+    future<::shared_ptr<transport::messages::result_message::prepared>>
+    store_prepared_statement(const std::experimental::string_view& query_string, const sstring& keyspace, ::shared_ptr<statements::prepared_statement> prepared, bool for_thrift);
+
+    // Erases the statements for which filter returns true.
+    template <typename Pred>
+    void invalidate_prepared_statements(Pred filter) {
+        static_assert(std::is_same<bool, std::result_of_t<Pred(::shared_ptr<cql_statement>)>>::value,
+                      "bad Pred signature");
+        for (auto it = _prepared_statements.begin(); it != _prepared_statements.end(); ) {
+            if (filter(it->second->statement)) {
+                it = _prepared_statements.erase(it);
+            } else {
+                ++it;
+            }
+        }
+        for (auto it = _thrift_prepared_statements.begin(); it != _thrift_prepared_statements.end(); ) {
+            if (filter(it->second->statement)) {
+                it = _thrift_prepared_statements.erase(it);
+            } else {
+                ++it;
+            }
+        }
+    }
+
+#if 0
+    public ResultMessage processPrepared(CQLStatement statement, QueryState queryState, QueryOptions options)
+    throws RequestExecutionException, RequestValidationException
+    {
+        List<ByteBuffer> variables = options.getValues();
+        // Check to see if there are any bound variables to verify
+        if (!(variables.isEmpty() && (statement.getBoundTerms() == 0)))
+        {
+            if (variables.size() != statement.getBoundTerms())
+                throw new InvalidRequestException(String.format("there were %d markers(?) in CQL but %d bound variables",
+                                                                statement.getBoundTerms(),
+                                                                variables.size()));
+
+            // at this point there is a match in count between markers and variables that is non-zero
+
+            if (logger.isTraceEnabled())
+                for (int i = 0; i < variables.size(); i++)
+                    logger.trace("[{}] '{}'", i+1, variables.get(i));
+        }
+
+        metrics.preparedStatementsExecuted.inc();
+        return processStatement(statement, queryState, options);
+    }
+#endif
+
+public:
+    future<::shared_ptr<transport::messages::result_message>> process_batch(::shared_ptr<statements::batch_statement>,
+            service::query_state& query_state, query_options& options);
+
+    ::shared_ptr<statements::prepared_statement> get_statement(const std::experimental::string_view& query,
+            const service::client_state& client_state);
+    static ::shared_ptr<statements::raw::parsed_statement> parse_statement(const std::experimental::string_view& query);
+
+#if 0
+    private static long measure(Object key)
+    {
+        return meter.measureDeep(key);
+    }
+#endif
+public:
+    future<> stop();
+
+    friend class migration_subscriber;
 };
 
 class query_processor::migration_subscriber : public service::migration_listener {
     query_processor* _qp;
-
 public:
     migration_subscriber(query_processor* qp);
 
@@ -379,14 +541,9 @@ public:
     virtual void on_drop_function(const sstring& ks_name, const sstring& function_name) override;
     virtual void on_drop_aggregate(const sstring& ks_name, const sstring& aggregate_name) override;
     virtual void on_drop_view(const sstring& ks_name, const sstring& view_name) override;
-
 private:
     void remove_invalid_prepared_statements(sstring ks_name, std::experimental::optional<sstring> cf_name);
-
-    bool should_invalidate(
-            sstring ks_name,
-            std::experimental::optional<sstring> cf_name,
-            ::shared_ptr<cql_statement> statement);
+    bool should_invalidate(sstring ks_name, std::experimental::optional<sstring> cf_name, ::shared_ptr<cql_statement> statement);
 };
 
 extern distributed<query_processor> _the_query_processor;

cql3/restrictions/abstract_restriction.hh

@@ -94,26 +94,6 @@ public:
         return true;
     }
 
-    /**
-     * Whether the specified row satisfied this restriction.
-     * Assumes the row is live, but not all cells. If a cell
-     * isn't live and there's a restriction on its column,
-     * then the function returns false.
-     *
-     * @param schema the schema the row belongs to
-     * @param key the partition key
-     * @param ckey the clustering key
-     * @param cells the remaining row columns
-     * @return the restriction resulting of the merge
-     * @throws InvalidRequestException if the restrictions cannot be merged
-     */
-    virtual bool is_satisfied_by(const schema& schema,
-                                 const partition_key& key,
-                                 const clustering_key_prefix& ckey,
-                                 const row& cells,
-                                 const query_options& options,
-                                 gc_clock::time_point now) const = 0;
-
 protected:
 #if 0
     protected static ByteBuffer validateIndexedValue(ColumnSpecification columnSpec,
@@ -133,7 +113,7 @@ protected:
      * @param function_name the function name
      * @return <code>true</code> if the specified term is using the specified function, <code>false</code> otherwise.
      */
-    static bool term_uses_function(::shared_ptr<term> term, const sstring& ks_name, const sstring& function_name) {
+    static bool uses_function(::shared_ptr<term> term, const sstring& ks_name, const sstring& function_name) {
         return bool(term) && term->uses_function(ks_name, function_name);
     }
 
@@ -145,9 +125,9 @@ protected:
      * @param function_name the function name
      * @return <code>true</code> if one of the specified term is using the specified function, <code>false</code> otherwise.
      */
-    static bool term_uses_function(const std::vector<::shared_ptr<term>>& terms, const sstring& ks_name, const sstring& function_name) {
+    static bool uses_function(const std::vector<::shared_ptr<term>>& terms, const sstring& ks_name, const sstring& function_name) {
         for (auto&& value : terms) {
-            if (term_uses_function(value, ks_name, function_name)) {
+            if (uses_function(value, ks_name, function_name)) {
                 return true;
             }
         }

cql3/restrictions/forwarding_primary_key_restrictions.hh

@@ -74,9 +74,11 @@ public:
         get_delegate()->merge_with(restriction);
     }
 
-    virtual bool has_supporting_index(const secondary_index::secondary_index_manager& index_manager) const override {
+#if 0
+    virtual bool has_supporting_index(::shared_ptr<secondary_index_manager> index_manager) override {
         return get_delegate()->has_supporting_index(index_manager);
     }
+#endif
 
     virtual std::vector<bytes_opt> values(const query_options& options) const override {
         return get_delegate()->values(options);

cql3/restrictions/multi_column_restriction.hh

@@ -85,20 +85,6 @@ public:
         do_merge_with(as_pkr);
     }
 
-    bool is_satisfied_by(const schema& schema,
-                         const partition_key& key,
-                         const clustering_key_prefix& ckey,
-                         const row& cells,
-                         const query_options& options,
-                         gc_clock::time_point now) const override {
-        for (auto&& range : bounds_ranges(options)) {
-            if (!range.contains(ckey, clustering_key_prefix::prefix_equal_tri_compare(schema))) {
-                return false;
-            }
-        }
-        return true;
-    }
-
 protected:
     virtual void do_merge_with(::shared_ptr<primary_key_restrictions<clustering_key_prefix>> other) = 0;
 
@@ -128,18 +114,19 @@ protected:
         }
         return str;
     }
-
-    virtual bool has_supporting_index(const secondary_index::secondary_index_manager& index_manager) const override {
-        for (const auto& index : index_manager.list_indexes()) {
-            if (is_supported_by(index))
+#if 0
+    @Override
+    public final boolean hasSupportingIndex(SecondaryIndexManager indexManager)
+    {
+        for (ColumnDefinition columnDef : columnDefs)
+        {
+            SecondaryIndex index = indexManager.getIndexForColumn(columnDef.name.bytes);
+            if (index != null && isSupportedBy(index))
                 return true;
         }
         return false;
     }
 
-    virtual bool is_supported_by(const secondary_index::index& index) const = 0;
-
-#if 0
     /**
      * Check if this type of restriction is supported for the specified column by the specified index.
      * @param index the Secondary index
@@ -168,16 +155,7 @@ public:
     { }
 
     virtual bool uses_function(const sstring& ks_name, const sstring& function_name) const override {
-        return abstract_restriction::term_uses_function(_value, ks_name, function_name);
-    }
-
-    virtual bool is_supported_by(const secondary_index::index& index) const override {
-        for (auto* cdef : _column_defs) {
-            if (index.supports_expression(*cdef, cql3::operator_type::EQ)) {
-                return true;
-            }
-        }
-        return false;
+        return abstract_restriction::uses_function(_value, ks_name, function_name);
     }
 
     virtual sstring to_string() const override {
@@ -240,15 +218,6 @@ class multi_column_restriction::IN : public multi_column_restriction {
 public:
     using multi_column_restriction::multi_column_restriction;
 
-    virtual bool is_supported_by(const secondary_index::index& index) const override {
-        for (auto* cdef : _column_defs) {
-            if (index.supports_expression(*cdef, cql3::operator_type::IN)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     virtual bool is_IN() const override {
         return true;
     }
@@ -335,11 +304,11 @@ public:
     { }
 
     virtual bool uses_function(const sstring& ks_name, const sstring& function_name) const override  {
-        return abstract_restriction::term_uses_function(_values, ks_name, function_name);
+        return abstract_restriction::uses_function(_values, ks_name, function_name);
     }
 
     virtual sstring to_string() const override  {
-        return sprint("IN(%s)", std::to_string(_values));
+        return sprint("IN(%s)", ::to_string(_values));
     }
 
 protected:
@@ -396,15 +365,6 @@ public:
         : slice(schema, defs, term_slice::new_instance(bound, inclusive, term))
     { }
 
-    virtual bool is_supported_by(const secondary_index::index& index) const override {
-        for (auto* cdef : _column_defs) {
-            if (_slice.is_supported_by(*cdef, index)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     virtual bool is_slice() const override {
         return true;
     }
@@ -468,8 +428,8 @@ public:
     }
 
     virtual bool uses_function(const sstring& ks_name, const sstring& function_name) const override {
-        return (_slice.has_bound(statements::bound::START) && abstract_restriction::term_uses_function(_slice.bound(statements::bound::START), ks_name, function_name))
-                || (_slice.has_bound(statements::bound::END) && abstract_restriction::term_uses_function(_slice.bound(statements::bound::END), ks_name, function_name));
+        return (_slice.has_bound(statements::bound::START) && abstract_restriction::uses_function(_slice.bound(statements::bound::START), ks_name, function_name))
+                || (_slice.has_bound(statements::bound::END) && abstract_restriction::uses_function(_slice.bound(statements::bound::END), ks_name, function_name));
     }
 
     virtual bool is_inclusive(statements::bound b) const override {

cql3/restrictions/primary_key_restrictions.hh

@@ -87,7 +87,6 @@ public:
     virtual std::vector<bounds_range_type> bounds_ranges(const query_options& options) const = 0;
 
     using restrictions::uses_function;
-    using restrictions::has_supporting_index;
 
     bool empty() const override {
         return get_column_defs().empty();

cql3/restrictions/restriction.hh

@@ -43,7 +43,6 @@
 
 #include <vector>
 
-#include "index/secondary_index_manager.hh"
 #include "cql3/query_options.hh"
 #include "cql3/statements/bound.hh"
 #include "types.hh"
@@ -108,15 +107,15 @@ public:
      */
     virtual void merge_with(::shared_ptr<restriction> other) = 0;
 
+#if 0
     /**
      * Check if the restriction is on indexed columns.
      *
      * @param indexManager the index manager
      * @return <code>true</code> if the restriction is on indexed columns, <code>false</code>
      */
-    virtual bool has_supporting_index(const secondary_index::secondary_index_manager& index_manager) const = 0;
+    public boolean hasSupportingIndex(SecondaryIndexManager indexManager);
 
-#if 0
     /**
      * Adds to the specified list the <code>IndexExpression</code>s corresponding to this <code>Restriction</code>.
      *

cql3/restrictions/restrictions.hh

@@ -47,7 +47,6 @@
 #include "cql3/query_options.hh"
 #include "types.hh"
 #include "schema.hh"
-#include "index/secondary_index_manager.hh"
 
 namespace cql3 {
 
@@ -75,15 +74,15 @@ public:
      */
     virtual bool uses_function(const sstring& ks_name, const sstring& function_name) const = 0;
 
+#if 0
     /**
      * Check if the restriction is on indexed columns.
      *
      * @param index_manager the index manager
      * @return <code>true</code> if the restriction is on indexed columns, <code>false</code>
      */
-    virtual bool has_supporting_index(const secondary_index::secondary_index_manager& index_manager) const = 0;
+    virtual bool has_supporting_index(::shared_ptr<secondary_index_manager> index_manager) const = 0;
 
-#if 0
     /**
      * Adds to the specified list the <code>index_expression</code>s corresponding to this <code>Restriction</code>.
      *