mutation_query_test: add test for result size calculation

Check that digest only and digest+data query calculate result size to be
the same.

Message-Id: <20180906153800.GK2326@scylladb.com>
(cherry picked from commit 9e438933a2)

.dockerignore

@@ -1,3 +0,0 @@
-.git
-build
-seastar/build

.github/ISSUE_TEMPLATE.md

@@ -1,9 +1,3 @@
-This is Scylla's bug tracker, to be used for reporting bugs only.
-If you have a question about Scylla, and not a bug, please ask it in
-our mailing-list at scylladb-dev@googlegroups.com or in our slack channel.
-
-- [] I have read the disclaimer above, and I am reporting a suspected malfunction in Scylla.
-
 *Installation details*
 Scylla version (or git commit hash):
 Cluster size:

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +0,0 @@
-Scylla doesn't use pull-requests, please send a patch to the [mailing list](mailto:scylladb-dev@googlegroups.com) instead.
-See our [contributing guidelines](../CONTRIBUTING.md) and our [Scylla development guidelines](../HACKING.md) for more information.
-
-If you have any questions please don't hesitate to send a mail to the [dev list](mailto:scylladb-dev@googlegroups.com).

.gitignore

@@ -18,4 +18,3 @@ CMakeLists.txt.user
 *.egg-info
 __pycache__CMakeLists.txt.user
 .gdbinit
-resources

.gitmodules

@@ -6,9 +6,6 @@
 	path = swagger-ui
 	url = ../scylla-swagger-ui
 	ignore = dirty
-[submodule "xxHash"]
-	path = xxHash
-	url = ../xxHash
-[submodule "libdeflate"]
-	path = libdeflate
-	url = ../libdeflate
+[submodule "dist/ami/files/scylla-ami"]
+	path = dist/ami/files/scylla-ami
+	url = ../scylla-ami

CMakeLists.txt

@@ -125,7 +125,7 @@ list(REMOVE_ITEM SEASTAR_CFLAGS "-DHAVE_GCC6_CONCEPTS")
 #
 # For ease of browsing the source code, we always pretend that DPDK is enabled.
 target_compile_options(scylla PUBLIC
-        -std=gnu++1z
+        -std=gnu++14
         -DHAVE_DPDK
         -DHAVE_HWLOC
         "${SEASTAR_CFLAGS}")
@@ -137,6 +137,4 @@ target_include_directories(scylla PUBLIC
         ${SEASTAR_DPDK_INCLUDE_DIRS}
         ${SEASTAR_INCLUDE_DIRS}
         ${Boost_INCLUDE_DIRS}
-        xxhash
-        libdeflate
         build/release/gen)

HACKING.md

@@ -20,13 +20,11 @@ $ git submodule update --init --recursive
 
 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.
+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. GCC >= 8.1.1. is
-required.
+**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.
 
@@ -45,7 +43,9 @@ The full suite of options for project configuration is available via
 $ ./configure.py --help
 ```
 
-The most important option is:
+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.
 
@@ -57,29 +57,6 @@ To save time -- for instance, to avoid compiling all unit tests -- you can also
 $ ninja-build build/release/tests/schema_change_test
 ```
 
-You can also specify a single mode. For example
-
-```bash
-$ ninja-build release
-```
-
-Will build everytihng in release mode. The valid modes are
-
-* Debug: Enables [AddressSanitizer](https://github.com/google/sanitizers/wiki/AddressSanitizer)
-  and other sanity checks. It has no optimizations, which allows for debugging with tools like
-  GDB. Debugging builds are generally slower and generate much larger object files than release builds.
-* Release: Fewer checks and more optimizations. It still has debug info.
-* Dev: No optimizations or debug info. The objective is to compile and link as fast as possible.
-  This is useful for the first iterations of a patch.
-
-
-Note that by default unit tests binaries are stripped so they can't be used with gdb or seastar-addr2line.
-To include debug information in the unit test binary, build the test binary with a `_g` suffix. For example,
-
-```bash
-$ ninja-build build/release/tests/schema_change_test_g
-```
-
 ### 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.
@@ -106,57 +83,9 @@ The `-c1 -m1G` arguments limit this Seastar-based test to a single system thread
 
 ### Preparing patches
 
-All changes to Scylla are submitted as patches to the public [mailing list](mailto:scylladb-dev@googlegroups.com). 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.
+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/). There are also some guidelines that can help you make the patch review process smoother:
-
-1. Before generating patches, make sure your Git configuration points to `.gitorderfile`. You can do it by running
-
-```bash
-$ git config diff.orderfile .gitorderfile
-```
-
-2. If you are sending more than a single patch, push your changes into a new branch of your fork of Scylla on GitHub and add a URL pointing to this branch to your cover letter.
-
-3. If you are sending a new revision of an earlier patchset, add a brief summary of changes in this version, for example:
-```
-In v3:
-    - declared move constructor and move assignment operator as noexcept
-    - used std::variant instead of a union
-    ...
-```
-
-4. Add information about the tests run with this fix. It can look like
-```
-"Tests: unit ({mode}), dtest ({smp})"
-```
-
-The usual is "Tests: unit (release)", although running debug tests is encouraged.
-
-5. When answering review comments, prefer inline quotes as they make it easier to track the conversation across multiple e-mails.
-
-6. The Linux kernel's [Submitting Patches](https://www.kernel.org/doc/html/v4.19/process/submitting-patches.html) document offers excellent advice on how to prepare patches and patchsets for review. Since the Scylla development process is derived from the kernel's, almost all of the advice there is directly applicable.
-
-### Finding a person to review and merge your patches
-
-You can use the `scripts/find-maintainer` script to find a subsystem maintainer and/or reviewer for your patches. The script accepts a filename in the git source tree as an argument and outputs a list of subsystems the file belongs to and their respective maintainers and reviewers. For example, if you changed the `cql3/statements/create_view_statement.hh` file, run the script as follows:
-
-```bash
-$ ./scripts/find-maintainer cql3/statements/create_view_statement.hh
-```
-
-and you will get output like this:
-
-```
-CQL QUERY LANGUAGE
-  Tomasz Grabiec <tgrabiec@scylladb.com>   [maintainer]
-  Pekka Enberg <penberg@scylladb.com>      [maintainer]
-MATERIALIZED VIEWS
-  Pekka Enberg <penberg@scylladb.com>      [maintainer]
-  Duarte Nunes <duarte@scylladb.com>       [maintainer]
-  Nadav Har'El <nyh@scylladb.com>          [reviewer]
-  Duarte Nunes <duarte@scylladb.com>       [reviewer]
-```
+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
 
@@ -189,29 +118,6 @@ On a development machine, one might run Scylla as
 $ SCYLLA_HOME=$HOME/scylla build/release/scylla --overprovisioned --developer-mode=yes
 ```
 
-To interact with scylla it is recommended to build our versions of
-cqlsh and nodetool. They are available at
-https://github.com/scylladb/scylla-tools-java and can be built with
-
-```bash
-$ ./install-dependencies.sh
-$ ant jar
-```
-
-cqlsh should work out of the box, but nodetool depends on a running
-scylla-jmx (https://github.com/scylladb/scylla-jmx). It can be build
-with
-
-```bash
-$ mvn package
-```
-
-and must be started with
-
-```bash
-$ ./scripts/scylla-jmx
-```
-
 ### 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.
@@ -302,7 +208,7 @@ In this example, `10.0.0.2` will be sent up to 16 jobs and the local machine wil
 
 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 sections speeding up this process.
+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
 
@@ -312,24 +218,6 @@ Linking Scylla can be slow. The gold linker can replace GNU ld and often speeds
 $ sudo alternatives --config ld
 ```
 
-### Using split dwarf
-
-With debug info enabled, most of the link time is spent copying and
-relocating it. It is possible to leave most of the debug info out of
-the link by writing it to a side .dwo file. This is done by passing
-`-gsplit-dwarf` to gcc.
-
-Unfortunately just `-gsplit-dwarf` would slow down `gdb` startup. To
-avoid that the gold linker can be told to create an index with
-`--gdb-index`.
-
-More info at https://gcc.gnu.org/wiki/DebugFission.
-
-Both options can be enable by passing `--split-dwarf` to configure.py.
-
-Note that distcc is *not* compatible with it, but icecream
-(https://github.com/icecc/icecream) is.
-
 ### 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.
@@ -343,8 +231,3 @@ $ git remote add local /home/tsmith/src/seastar
 $ git remote update
 $ git checkout -t local/my_local_seastar_branch
 ```
-
-### Core dump debugging
-
-Slides:
-2018.11.20: https://www.slideshare.net/tomekgrabiec/scylla-core-dump-debugging-tools

MAINTAINERS

@@ -1,131 +0,0 @@
-M: Maintainer with commit access
-R: Reviewer with subsystem expertise
-F: Filename, directory, or pattern for the subsystem
-
----
-
-AUTH
-M: Paweł Dziepak <pdziepak@scylladb.com>
-M: Duarte Nunes <duarte@scylladb.com>
-R: Calle Wilund <calle@scylladb.com>
-R: Vlad Zolotarov <vladz@scylladb.com>
-R: Jesse Haber-Kucharsky <jhaberku@scylladb.com>
-F: auth/*
-
-CACHE
-M: Tomasz Grabiec <tgrabiec@scylladb.com>
-M: Paweł Dziepak <pdziepak@scylladb.com>
-R: Piotr Jastrzebski <piotr@scylladb.com>
-F: row_cache*
-F: *mutation*
-F: tests/mvcc*
-
-COMMITLOG / BATCHLOGa
-M: Paweł Dziepak <pdziepak@scylladb.com>
-M: Duarte Nunes <duarte@scylladb.com>
-R: Calle Wilund <calle@scylladb.com>
-F: db/commitlog/*
-F: db/batch*
-
-COORDINATOR
-M: Paweł Dziepak <pdziepak@scylladb.com>
-M: Duarte Nunes <duarte@scylladb.com>
-R: Gleb Natapov <gleb@scylladb.com>
-F: service/storage_proxy*
-
-COMPACTION
-R: Raphael S. Carvalho <raphaelsc@scylladb.com>
-R: Glauber Costa <glauber@scylladb.com>
-R: Nadav Har'El <nyh@scylladb.com>
-F: sstables/compaction*
-
-CQL TRANSPORT LAYER
-M: Pekka Enberg <penberg@scylladb.com>
-F: transport/*
-
-CQL QUERY LANGUAGE
-M: Tomasz Grabiec <tgrabiec@scylladb.com>
-M: Pekka Enberg <penberg@scylladb.com>
-F: cql3/*
-
-COUNTERS
-M: Paweł Dziepak <pdziepak@scylladb.com>
-F: counters*
-F: tests/counter_test*
-
-GOSSIP
-M: Duarte Nunes <duarte@scylladb.com>
-M: Tomasz Grabiec <tgrabiec@scylladb.com>
-R: Asias He <asias@scylladb.com>
-F: gms/*
-
-DOCKER
-M: Pekka Enberg <penberg@scylladb.com>
-F: dist/docker/*
-
-LSA
-M: Tomasz Grabiec <tgrabiec@scylladb.com>
-M: Paweł Dziepak <pdziepak@scylladb.com>
-F: utils/logalloc*
-
-MATERIALIZED VIEWS
-M: Duarte Nunes <duarte@scylladb.com>
-M: Pekka Enberg <penberg@scylladb.com>
-R: Nadav Har'El <nyh@scylladb.com>
-R: Duarte Nunes <duarte@scylladb.com>
-F: db/view/*
-F: cql3/statements/*view*
-
-PACKAGING
-R: Takuya ASADA <syuu@scylladb.com>
-F: dist/*
-
-REPAIR
-M: Tomasz Grabiec <tgrabiec@scylladb.com>
-M: Duarte Nunes <duarte@scylladb.com>
-R: Asias He <asias@scylladb.com>
-R: Nadav Har'El <nyh@scylladb.com>
-F: repair/*
-
-SCHEMA MANAGEMENT
-M: Tomasz Grabiec <tgrabiec@scylladb.com>
-M: Duarte Nunes <duarte@scylladb.com>
-M: Pekka Enberg <penberg@scylladb.com>
-F: db/schema_tables*
-F: db/legacy_schema_migrator*
-F: service/migration*
-F: schema*
-
-SECONDARY INDEXES
-M: Pekka Enberg <penberg@scylladb.com>
-M: Duarte Nunes <duarte@scylladb.com>
-R: Nadav Har'El <nyh@scylladb.com>
-R: Pekka Enberg <penberg@scylladb.com>
-F: db/index/*
-F: cql3/statements/*index*
-
-SSTABLES
-M: Tomasz Grabiec <tgrabiec@scylladb.com>
-M: Duarte Nunes <duarte@scylladb.com>
-R: Raphael S. Carvalho <raphaelsc@scylladb.com>
-R: Glauber Costa <glauber@scylladb.com>
-R: Nadav Har'El <nyh@scylladb.com>
-F: sstables/*
-
-STREAMING
-M: Tomasz Grabiec <tgrabiec@scylladb.com>
-M: Duarte Nunes <duarte@scylladb.com>
-R: Asias He <asias@scylladb.com>
-F: streaming/*
-F: service/storage_service.*
-
-THRIFT TRANSPORT LAYER
-M: Duarte Nunes <duarte@scylladb.com>
-F: thrift/*
-
-THE REST
-M: Avi Kivity <avi@scylladb.com>
-M: Paweł Dziepak <pdziepak@scylladb.com>
-M: Duarte Nunes <duarte@scylladb.com>
-M: Tomasz Grabiec <tgrabiec@scylladb.com>
-F: *

NOTICE.txt

@@ -1,5 +1,2 @@
 This project includes code developed by the Apache Software Foundation (http://www.apache.org/),
 especially Apache Cassandra.
-
-It also includes files from https://github.com/antonblanchard/crc32-vpmsum (author Anton Blanchard <anton@au.ibm.com>, IBM).
-These files are located in utils/arch/powerpc/crc32-vpmsum. Their license may be found in licenses/LICENSE-crc32-vpmsum.TXT.

README.md

@@ -13,11 +13,6 @@ $ # Rejoice!
 
 Please see [HACKING.md](HACKING.md) for detailed information on building and developing Scylla.
 
-**Note**: GCC >= 8.1.1 is require to compile Scylla.
-
-**Note**: See [frozen toolchain](tools/toolchain/README.md) for a way to build and run
-   on an older distribution.
-
 ## Running Scylla
 
 * Run Scylla

SCYLLA-VERSION-GEN

@@ -1,7 +1,6 @@
 #!/bin/sh
 
-PRODUCT=scylla
-VERSION=3.1.4
+VERSION=2.1.6
 
 if test -f version
 then
@@ -23,4 +22,3 @@ echo "$SCYLLA_VERSION-$SCYLLA_RELEASE"
 mkdir -p build
 echo "$SCYLLA_VERSION" > build/SCYLLA-VERSION-FILE
 echo "$SCYLLA_RELEASE" > build/SCYLLA-RELEASE-FILE
-echo "$PRODUCT" > build/SCYLLA-PRODUCT-FILE

api/api-doc/column_family.json

@@ -455,7 +455,7 @@
          "operations":[
             {
                "method":"GET",
-               "summary":"Returns a list of sstable filenames that contain the given partition key on this node",
+               "summary":"Returns a list of filenames that contain the given key on this node",
                "type":"array",
                "items":{
                   "type":"string"
@@ -475,7 +475,7 @@
                   },
                   {
                      "name":"key",
-                     "description":"The partition key. In a composite-key scenario, use ':' to separate the columns in the key.",
+                     "description":"The key",
                      "required":true,
                      "allowMultiple":false,
                      "type":"string",
@@ -611,54 +611,6 @@
             }
          ]
       },
-      {
-         "path":"/column_family/toppartitions/{name}",
-         "operations":[
-            {
-               "method":"GET",
-               "summary":"Toppartitions query",
-               "type":"toppartitions_query_results",
-               "nickname":"toppartitions",
-               "produces":[
-                  "application/json"
-               ],
-               "parameters":[
-                  {
-                     "name":"name",
-                     "description":"The column family name in keyspace:name format",
-                     "required":true,
-                     "allowMultiple":false,
-                     "type":"string",
-                     "paramType":"path"
-                  },
-                  {
-                     "name":"duration",
-                     "description":"Duration (in milliseconds) of monitoring operation",
-                     "required":true,
-                     "allowMultiple":false,
-                     "type":"int",
-                     "paramType":"query"
-                  },
-                  {
-                    "name":"list_size",
-                    "description":"number of the top partitions to list",
-                    "required":false,
-                    "allowMultiple":false,
-                    "type":"int",
-                    "paramType":"query"
-                 },
-                 {
-                    "name":"capacity",
-                    "description":"capacity of stream summary: determines amount of resources used in query processing",
-                    "required":false,
-                    "allowMultiple":false,
-                    "type":"int",
-                    "paramType":"query"
-                 }
-              ]
-            }
-         ]
-      },
       {
          "path":"/column_family/metrics/memtable_columns_count/",
          "operations":[
@@ -2864,44 +2816,6 @@
                "description":"The column family type"
             }
          }
-      },
-      "toppartitions_record":{
-         "id":"toppartitions_record",
-         "description":"nodetool toppartitions query record",
-         "properties":{
-            "partition":{
-               "type":"string",
-               "description":"Partition key"
-            },
-            "count":{
-               "type":"long",
-               "description":"Number of read/write operations"
-            },
-            "error":{
-               "type":"long",
-               "description":"Indication of inaccuracy in counting PKs"
-            }
-         }
-      },
-      "toppartitions_query_results":{
-         "id":"toppartitions_query_results",
-         "description":"nodetool toppartitions query results",
-         "properties":{
-            "read":{
-               "type":"array",
-               "items":{
-                  "type":"toppartitions_record"
-               },
-               "description":"Read results"
-            },
-            "write":{
-               "type":"array",
-               "items":{
-                  "type":"toppartitions_record"
-               },
-               "description":"Write results"
-            }
-         }
       }
    }
 }

api/api-doc/config.json

@@ -1,30 +0,0 @@
-"/v2/config/{id}": {
-      "get": {
-        "description": "Return a config value",
-        "operationId": "find_config_id",
-        "produces": [
-          "application/json"
-        ],
-        "tags": ["config"],
-        "parameters": [
-          {
-            "name": "id",
-            "in": "path",
-            "description": "ID of config to return",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Config value"
-          },
-          "default": {
-            "description": "unexpected error",
-            "schema": {
-              "$ref": "#/definitions/ErrorModel"
-            }
-          }
-        }
-      }
-}

api/api-doc/storage_service.json

@@ -792,24 +792,6 @@
             }
          ]
       },
-      {
-         "path":"/storage_service/active_repair/",
-         "operations":[
-            {
-               "method":"GET",
-               "summary":"Return an array with the ids of the currently active repairs",
-               "type":"array",
-               "items":{
-                  "type":"int"
-               },
-               "nickname":"get_active_repair_async",
-               "produces":[
-                  "application/json"
-               ],
-               "parameters":[]
-            }
-         ]
-      },
       {
          "path":"/storage_service/repair_async/{keyspace}",
          "operations":[
@@ -2129,41 +2111,6 @@
                ]
             }
          ]
-      },
-      {
-         "path":"/storage_service/view_build_statuses/{keyspace}/{view}",
-         "operations":[
-            {
-               "method":"GET",
-               "summary":"Gets the progress of a materialized view build",
-               "type":"array",
-               "items":{
-                  "type":"mapper"
-               },
-               "nickname":"view_build_statuses",
-               "produces":[
-                  "application/json"
-               ],
-               "parameters":[
-                  {
-                     "name":"keyspace",
-                     "description":"The keyspace",
-                     "required":true,
-                     "allowMultiple":false,
-                     "type":"string",
-                     "paramType":"path"
-                  },
-                  {
-                     "name":"view",
-                     "description":"View name",
-                     "required":true,
-                     "allowMultiple":false,
-                     "type":"string",
-                     "paramType":"path"
-                  }
-               ]
-            }
-         ]
       }
    ],
    "models":{
@@ -2228,11 +2175,11 @@
                "description":"The column family"
             },
             "total":{
-               "type":"long",
+               "type":"int",
                "description":"The total snapshot size"
             },
             "live":{
-               "type":"long",
+               "type":"int",
                "description":"The live snapshot size"
             }
          }

api/api-doc/swagger20_header.json

@@ -1,29 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "version": "1.0.0",
-    "title": "Scylla API",
-    "description": "The scylla API version 2.0",
-    "termsOfService": "http://www.scylladb.com/tos/",
-    "contact": {
-      "name": "Scylla Team",
-      "email": "info@scylladb.com",
-      "url": "http://scylladb.com"
-    },
-    "license": {
-      "name": "AGPL",
-      "url": "https://github.com/scylladb/scylla/blob/master/LICENSE.AGPL"
-    }
-  },
-  "host": "{{Host}}",
-  "basePath": "/v2",
-  "schemes": [
-    "http"
-  ],
-  "consumes": [
-    "application/json"
-  ],
-  "produces": [
-    "application/json"
-  ],
-  "paths": {

api/api.cc

@@ -20,9 +20,9 @@
  */
 
 #include "api.hh"
-#include <seastar/http/file_handler.hh>
-#include <seastar/http/transformers.hh>
-#include <seastar/http/api_docs.hh>
+#include "http/file_handler.hh"
+#include "http/transformers.hh"
+#include "http/api_docs.hh"
 #include "storage_service.hh"
 #include "commitlog.hh"
 #include "gossiper.hh"
@@ -36,12 +36,9 @@
 #include "endpoint_snitch.hh"
 #include "compaction_manager.hh"
 #include "hinted_handoff.hh"
-#include <seastar/http/exception.hh>
+#include "http/exception.hh"
 #include "stream_manager.hh"
 #include "system.hh"
-#include "api/config.hh"
-
-logging::logger apilog("api");
 
 namespace api {
 
@@ -57,18 +54,14 @@ static std::unique_ptr<reply> exception_reply(std::exception_ptr eptr) {
 
 future<> set_server_init(http_context& ctx) {
     auto rb = std::make_shared < api_registry_builder > (ctx.api_doc);
-    auto rb02 = std::make_shared < api_registry_builder20 > (ctx.api_doc, "/v2");
 
-    return ctx.http_server.set_routes([rb, &ctx, rb02](routes& r) {
+    return ctx.http_server.set_routes([rb, &ctx](routes& r) {
         r.register_exeption_handler(exception_reply);
         r.put(GET, "/ui", new httpd::file_handler(ctx.api_dir + "/index.html",
                 new content_replace("html")));
         r.add(GET, url("/ui").remainder("path"), new httpd::directory_handler(ctx.api_dir,
                 new content_replace("html")));
         rb->set_api_doc(r);
-        rb02->set_api_doc(r);
-        rb02->register_api_file(r, "swagger20_header");
-        set_config(rb02, ctx, r);
         rb->register_function(r, "system",
                 "The system related API");
         set_system(ctx, r);
@@ -119,11 +112,6 @@ future<> set_server_stream_manager(http_context& ctx) {
                 "The stream manager API", set_stream_manager);
 }
 
-future<> set_server_cache(http_context& ctx) {
-    return register_api(ctx, "cache_service",
-            "The cache service API", set_cache_service);
-}
-
 future<> set_server_gossip_settle(http_context& ctx) {
     auto rb = std::make_shared < api_registry_builder > (ctx.api_doc);
 
@@ -131,6 +119,9 @@ future<> set_server_gossip_settle(http_context& ctx) {
         rb->register_function(r, "failure_detector",
                 "The failure detector API");
         set_failure_detector(ctx,r);
+        rb->register_function(r, "cache_service",
+                "The cache service API");
+        set_cache_service(ctx,r);
     });
 }
 

api/api.hh

@@ -21,15 +21,13 @@
 
 #pragma once
 
-#include <seastar/json/json_elements.hh>
-#include <type_traits>
+#include "json/json_elements.hh"
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
-#include <boost/units/detail/utility.hpp>
 #include "api/api-doc/utils.json.hh"
 #include "utils/histogram.hh"
-#include <seastar/http/exception.hh>
+#include "http/exception.hh"
 #include "api_init.hh"
 #include "seastarx.hh"
 
@@ -218,42 +216,4 @@ std::vector<T> concat(std::vector<T> a, std::vector<T>&& b) {
     return a;
 }
 
-template <class T, class Base = T>
-class req_param {
-public:
-    sstring name;
-    sstring param;
-    T value;
-
-    req_param(const request& req, sstring name, T default_val) : name(name) {
-        param = req.get_query_param(name);
-        if (param.empty()) {
-            value = default_val;
-            return;
-        }
-        try {
-            // boost::lexical_cast does not use boolalpha. Converting a
-            // true/false throws exceptions. We don't want that.
-            if constexpr (std::is_same_v<Base, bool>) {
-                // Cannot use boolalpha because we (probably) want to
-                // accept 1 and 0 as well as true and false. And True. And fAlse.
-                std::transform(param.begin(), param.end(), param.begin(), ::tolower);
-                if (param == "true" || param == "1") {
-                    value = T(true);
-                } else if (param == "false" || param == "0") {
-                    value = T(false);
-                } else {
-                    throw boost::bad_lexical_cast{};
-                }
-            } else {
-                value = T{boost::lexical_cast<Base>(param)};
-            }
-        } catch (boost::bad_lexical_cast&) {
-            throw bad_param_exception(format("{} ({}): type error - should be {}", name, param, boost::units::detail::demangle(typeid(Base).name())));
-        }
-    }
-
-    operator T() const { return value; }
-};
-
 }

api/api_init.hh

@@ -19,9 +19,9 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include "database_fwd.hh"
+#include "database.hh"
 #include "service/storage_proxy.hh"
-#include <seastar/http/httpd.hh>
+#include "http/httpd.hh"
 
 namespace api {
 
@@ -46,7 +46,7 @@ future<> set_server_messaging_service(http_context& ctx);
 future<> set_server_storage_proxy(http_context& ctx);
 future<> set_server_stream_manager(http_context& ctx);
 future<> set_server_gossip_settle(http_context& ctx);
-future<> set_server_cache(http_context& ctx);
 future<> set_server_done(http_context& ctx);
 
+
 }

api/collectd.cc

@@ -21,8 +21,8 @@
 
 #include "collectd.hh"
 #include "api/api-doc/collectd.json.hh"
-#include <seastar/core/scollectd.hh>
-#include <seastar/core/scollectd_api.hh>
+#include "core/scollectd.hh"
+#include "core/scollectd_api.hh"
 #include "endian.h"
 #include <boost/range/irange.hpp>
 #include <regex>

api/column_family.cc

@@ -22,15 +22,11 @@
 #include "column_family.hh"
 #include "api/api-doc/column_family.json.hh"
 #include <vector>
-#include <seastar/http/exception.hh>
+#include "http/exception.hh"
 #include "sstables/sstables.hh"
 #include "utils/estimated_histogram.hh"
 #include <algorithm>
 
-#include "db/data_listeners.hh"
-
-extern logging::logger apilog;
-
 namespace api {
 using namespace httpd;
 
@@ -38,7 +34,7 @@ using namespace std;
 using namespace json;
 namespace cf = httpd::column_family_json;
 
-std::tuple<sstring, sstring> parse_fully_qualified_cf_name(sstring name) {
+const utils::UUID& get_uuid(const sstring& name, const database& db) {
     auto pos = name.find("%3A");
     size_t end;
     if (pos == sstring::npos) {
@@ -50,15 +46,11 @@ std::tuple<sstring, sstring> parse_fully_qualified_cf_name(sstring name) {
     } else {
         end = pos + 3;
     }
-    return std::make_tuple(name.substr(0, pos), name.substr(end));
-}
-
-const utils::UUID& get_uuid(const sstring& name, const database& db) {
-    auto [ks, cf] = parse_fully_qualified_cf_name(name);
     try {
-        return db.find_uuid(ks, cf);
+        return db.find_uuid(name.substr(0, pos), name.substr(end));
     } catch (std::out_of_range& e) {
-        throw bad_param_exception(format("Column family '{}:{}' not found", ks, cf));
+        throw bad_param_exception("Column family '" + name.substr(0, pos) + ":"
+                + name.substr(end) + "' not found");
     }
 }
 
@@ -174,27 +166,27 @@ static future<json::json_return_type> get_cf_unleveled_sstables(http_context& ct
     }, std::plus<int64_t>());
 }
 
-static int64_t min_partition_size(column_family& cf) {
+static int64_t min_row_size(column_family& cf) {
     int64_t res = INT64_MAX;
     for (auto i: *cf.get_sstables() ) {
-        res = std::min(res, i->get_stats_metadata().estimated_partition_size.min());
+        res = std::min(res, i->get_stats_metadata().estimated_row_size.min());
     }
     return (res == INT64_MAX) ? 0 : res;
 }
 
-static int64_t max_partition_size(column_family& cf) {
+static int64_t max_row_size(column_family& cf) {
     int64_t res = 0;
     for (auto i: *cf.get_sstables() ) {
-        res = std::max(i->get_stats_metadata().estimated_partition_size.max(), res);
+        res = std::max(i->get_stats_metadata().estimated_row_size.max(), res);
     }
     return res;
 }
 
-static integral_ratio_holder mean_partition_size(column_family& cf) {
+static integral_ratio_holder mean_row_size(column_family& cf) {
     integral_ratio_holder res;
     for (auto i: *cf.get_sstables() ) {
-        auto c = i->get_stats_metadata().estimated_partition_size.count();
-        res.sub += i->get_stats_metadata().estimated_partition_size.mean() * c;
+        auto c = i->get_stats_metadata().estimated_row_size.count();
+        res.sub += i->get_stats_metadata().estimated_row_size.mean() * c;
         res.total += c;
     }
     return res;
@@ -411,24 +403,22 @@ void set_column_family(http_context& ctx, routes& r) {
         return get_cf_stats(ctx, &column_family::stats::memtable_switch_count);
     });
 
-    // FIXME: this refers to partitions, not rows.
     cf::get_estimated_row_size_histogram.set(r, [&ctx] (std::unique_ptr<request> req) {
         return map_reduce_cf(ctx, req->param["name"], utils::estimated_histogram(0), [](column_family& cf) {
             utils::estimated_histogram res(0);
             for (auto i: *cf.get_sstables() ) {
-                res.merge(i->get_stats_metadata().estimated_partition_size);
+                res.merge(i->get_stats_metadata().estimated_row_size);
             }
             return res;
         },
         utils::estimated_histogram_merge, utils_json::estimated_histogram());
     });
 
-    // FIXME: this refers to partitions, not rows.
     cf::get_estimated_row_count.set(r, [&ctx] (std::unique_ptr<request> req) {
         return map_reduce_cf(ctx, req->param["name"], int64_t(0), [](column_family& cf) {
             uint64_t res = 0;
             for (auto i: *cf.get_sstables() ) {
-                res += i->get_stats_metadata().estimated_partition_size.count();
+                res += i->get_stats_metadata().estimated_row_size.count();
             }
             return res;
         },
@@ -439,7 +429,7 @@ void set_column_family(http_context& ctx, routes& r) {
         return map_reduce_cf(ctx, req->param["name"], utils::estimated_histogram(0), [](column_family& cf) {
             utils::estimated_histogram res(0);
             for (auto i: *cf.get_sstables() ) {
-                res.merge(i->get_stats_metadata().estimated_cells_count);
+                res.merge(i->get_stats_metadata().estimated_column_count);
             }
             return res;
         },
@@ -556,36 +546,30 @@ void set_column_family(http_context& ctx, routes& r) {
         return sum_sstable(ctx, true);
     });
 
-    // FIXME: this refers to partitions, not rows.
     cf::get_min_row_size.set(r, [&ctx] (std::unique_ptr<request> req) {
-        return map_reduce_cf(ctx, req->param["name"], INT64_MAX, min_partition_size, min_int64);
+        return map_reduce_cf(ctx, req->param["name"], INT64_MAX, min_row_size, min_int64);
     });
 
-    // FIXME: this refers to partitions, not rows.
     cf::get_all_min_row_size.set(r, [&ctx] (std::unique_ptr<request> req) {
-        return map_reduce_cf(ctx, INT64_MAX, min_partition_size, min_int64);
+        return map_reduce_cf(ctx, INT64_MAX, min_row_size, min_int64);
     });
 
-    // FIXME: this refers to partitions, not rows.
     cf::get_max_row_size.set(r, [&ctx] (std::unique_ptr<request> req) {
-        return map_reduce_cf(ctx, req->param["name"], int64_t(0), max_partition_size, max_int64);
+        return map_reduce_cf(ctx, req->param["name"], int64_t(0), max_row_size, max_int64);
     });
 
-    // FIXME: this refers to partitions, not rows.
     cf::get_all_max_row_size.set(r, [&ctx] (std::unique_ptr<request> req) {
-        return map_reduce_cf(ctx, int64_t(0), max_partition_size, max_int64);
+        return map_reduce_cf(ctx, int64_t(0), max_row_size, max_int64);
     });
 
-    // FIXME: this refers to partitions, not rows.
     cf::get_mean_row_size.set(r, [&ctx] (std::unique_ptr<request> req) {
         // Cassandra 3.x mean values are truncated as integrals.
-        return map_reduce_cf(ctx, req->param["name"], integral_ratio_holder(), mean_partition_size, std::plus<integral_ratio_holder>());
+        return map_reduce_cf(ctx, req->param["name"], integral_ratio_holder(), mean_row_size, std::plus<integral_ratio_holder>());
     });
 
-    // FIXME: this refers to partitions, not rows.
     cf::get_all_mean_row_size.set(r, [&ctx] (std::unique_ptr<request> req) {
         // Cassandra 3.x mean values are truncated as integrals.
-        return map_reduce_cf(ctx, integral_ratio_holder(), mean_partition_size, std::plus<integral_ratio_holder>());
+        return map_reduce_cf(ctx, integral_ratio_holder(), mean_row_size, std::plus<integral_ratio_holder>());
     });
 
     cf::get_bloom_filter_false_positives.set(r, [&ctx] (std::unique_ptr<request> req) {
@@ -921,60 +905,5 @@ void set_column_family(http_context& ctx, routes& r) {
             return make_ready_future<json::json_return_type>(res);
         });
     });
-
-    cf::get_sstables_for_key.set(r, [&ctx](std::unique_ptr<request> req) {
-        auto key = req->get_query_param("key");
-        auto uuid = get_uuid(req->param["name"], ctx.db.local());
-
-        return ctx.db.map_reduce0([key, uuid] (database& db) {
-            return db.find_column_family(uuid).get_sstables_by_partition_key(key);
-        }, std::unordered_set<sstring>(),
-            [](std::unordered_set<sstring> a, std::unordered_set<sstring>&& b) mutable {
-            a.insert(b.begin(),b.end());
-            return a;
-        }).then([](const std::unordered_set<sstring>& res) {
-            return make_ready_future<json::json_return_type>(container_to_vec(res));
-        });
-    });
-
-    cf::toppartitions.set(r, [&ctx] (std::unique_ptr<request> req) {
-        auto name_param = req->param["name"];
-        auto [ks, cf] = parse_fully_qualified_cf_name(name_param);
-
-        api::req_param<std::chrono::milliseconds, unsigned> duration{*req, "duration", 1000ms};
-        api::req_param<unsigned> capacity(*req, "capacity", 256);
-        api::req_param<unsigned> list_size(*req, "list_size", 10);
-
-        apilog.info("toppartitions query: name={} duration={} list_size={} capacity={}",
-            name_param, duration.param, list_size.param, capacity.param);
-
-        return seastar::do_with(db::toppartitions_query(ctx.db, ks, cf, duration.value, list_size, capacity), [&ctx](auto& q) {
-            return q.scatter().then([&q] {
-                return sleep(q.duration()).then([&q] {
-                    return q.gather(q.capacity()).then([&q] (auto topk_results) {
-                        apilog.debug("toppartitions query: processing results");
-                        cf::toppartitions_query_results results;
-
-                        for (auto& d: topk_results.read.top(q.list_size())) {
-                            cf::toppartitions_record r;
-                            r.partition = sstring(d.item);
-                            r.count = d.count;
-                            r.error = d.error;
-                            results.read.push(r);
-                        }
-                        for (auto& d: topk_results.write.top(q.list_size())) {
-                            cf::toppartitions_record r;
-                            r.partition = sstring(d.item);
-                            r.count = d.count;
-                            r.error = d.error;
-                            results.write.push(r);
-                        }
-                        return make_ready_future<json::json_return_type>(results);
-                    });
-                });
-            });
-        });
-    });
-
 }
 }

api/column_family.hh

@@ -24,8 +24,6 @@
 #include "api.hh"
 #include "api/api-doc/column_family.json.hh"
 #include "database.hh"
-#include <seastar/core/future-util.hh>
-#include <any>
 
 namespace api {
 
@@ -39,15 +37,9 @@ template<class Mapper, class I, class Reducer>
 future<I> map_reduce_cf_raw(http_context& ctx, const sstring& name, I init,
         Mapper mapper, Reducer reducer) {
     auto uuid = get_uuid(name, ctx.db.local());
-    using mapper_type = std::function<std::any (database&)>;
-    using reducer_type = std::function<std::any (std::any, std::any)>;
-    return ctx.db.map_reduce0(mapper_type([mapper, uuid](database& db) {
-        return I(mapper(db.find_column_family(uuid)));
-    }), std::any(std::move(init)), reducer_type([reducer = std::move(reducer)] (std::any a, std::any b) mutable {
-        return I(reducer(std::any_cast<I>(std::move(a)), std::any_cast<I>(std::move(b))));
-    })).then([] (std::any r) {
-        return std::any_cast<I>(std::move(r));
-    });
+    return ctx.db.map_reduce0([mapper, uuid](database& db) {
+        return mapper(db.find_column_family(uuid));
+    }, init, reducer);
 }
 
 
@@ -59,43 +51,35 @@ future<json::json_return_type> map_reduce_cf(http_context& ctx, const sstring& n
     });
 }
 
+template<class Mapper, class I, class Reducer, class Result>
+future<I> map_reduce_cf_raw(http_context& ctx, const sstring& name, I init,
+        Mapper mapper, Reducer reducer, Result result) {
+    auto uuid = get_uuid(name, ctx.db.local());
+    return ctx.db.map_reduce0([mapper, uuid](database& db) {
+        return mapper(db.find_column_family(uuid));
+    }, init, reducer);
+}
+
+
 template<class Mapper, class I, class Reducer, class Result>
 future<json::json_return_type> map_reduce_cf(http_context& ctx, const sstring& name, I init,
         Mapper mapper, Reducer reducer, Result result) {
-    return map_reduce_cf_raw(ctx, name, init, mapper, reducer).then([result](const I& res) mutable {
+    return map_reduce_cf_raw(ctx, name, init, mapper, reducer, result).then([result](const I& res) mutable {
         result = res;
         return make_ready_future<json::json_return_type>(result);
     });
 }
 
-struct map_reduce_column_families_locally {
-    std::any init;
-    std::function<std::any (column_family&)> mapper;
-    std::function<std::any (std::any, std::any)> reducer;
-    future<std::any> operator()(database& db) const {
-        auto res = seastar::make_lw_shared<std::any>(init);
-        return do_for_each(db.get_column_families(), [res, this](const std::pair<utils::UUID, seastar::lw_shared_ptr<table>>& i) {
-            *res = reducer(*res.get(), mapper(*i.second.get()));
-        }).then([res] {
-            return *res;
-        });
-    }
-};
-
 template<class Mapper, class I, class Reducer>
 future<I> map_reduce_cf_raw(http_context& ctx, I init,
         Mapper mapper, Reducer reducer) {
-    using mapper_type = std::function<std::any (column_family&)>;
-    using reducer_type = std::function<std::any (std::any, std::any)>;
-    auto wrapped_mapper = mapper_type([mapper = std::move(mapper)] (column_family& cf) mutable {
-        return I(mapper(cf));
-    });
-    auto wrapped_reducer = reducer_type([reducer = std::move(reducer)] (std::any a, std::any b) mutable {
-        return I(reducer(std::any_cast<I>(std::move(a)), std::any_cast<I>(std::move(b))));
-    });
-    return ctx.db.map_reduce0(map_reduce_column_families_locally{init, std::move(wrapped_mapper), wrapped_reducer}, std::any(init), wrapped_reducer).then([] (std::any res) {
-        return std::any_cast<I>(std::move(res));
-    });
+    return ctx.db.map_reduce0([mapper, init, reducer](database& db) {
+        auto res = init;
+        for (auto i : db.get_column_families()) {
+            res = reducer(res, mapper(*i.second.get()));
+        }
+        return res;
+    }, init, reducer);
 }
 
 

api/commitlog.cc

@@ -22,16 +22,15 @@
 #include "commitlog.hh"
 #include <db/commitlog/commitlog.hh>
 #include "api/api-doc/commitlog.json.hh"
-#include "database.hh"
 #include <vector>
 
 namespace api {
 
-template<typename T>
-static auto acquire_cl_metric(http_context& ctx, std::function<T (db::commitlog*)> func) {
-    typedef T ret_type;
+template<typename Func>
+static auto acquire_cl_metric(http_context& ctx, Func&& func) {
+    typedef std::result_of_t<Func(db::commitlog *)> ret_type;
 
-    return ctx.db.map_reduce0([func = std::move(func)](database& db) {
+    return ctx.db.map_reduce0([func = std::forward<Func>(func)](database& db) {
         if (db.commitlog() == nullptr) {
             return make_ready_future<ret_type>();
         }
@@ -64,15 +63,15 @@ void set_commitlog(http_context& ctx, routes& r) {
     });
 
     httpd::commitlog_json::get_completed_tasks.set(r, [&ctx](std::unique_ptr<request> req) {
-        return acquire_cl_metric<uint64_t>(ctx, std::bind(&db::commitlog::get_completed_tasks, std::placeholders::_1));
+        return acquire_cl_metric(ctx, std::bind(&db::commitlog::get_completed_tasks, std::placeholders::_1));
     });
 
     httpd::commitlog_json::get_pending_tasks.set(r, [&ctx](std::unique_ptr<request> req) {
-        return acquire_cl_metric<uint64_t>(ctx, std::bind(&db::commitlog::get_pending_tasks, std::placeholders::_1));
+        return acquire_cl_metric(ctx, std::bind(&db::commitlog::get_pending_tasks, std::placeholders::_1));
     });
 
     httpd::commitlog_json::get_total_commit_log_size.set(r, [&ctx](std::unique_ptr<request> req) {
-        return acquire_cl_metric<uint64_t>(ctx, std::bind(&db::commitlog::get_total_size, std::placeholders::_1));
+        return acquire_cl_metric(ctx, std::bind(&db::commitlog::get_total_size, std::placeholders::_1));
     });
 }
 

api/compaction_manager.cc

@@ -47,8 +47,8 @@ void set_compaction_manager(http_context& ctx, routes& r) {
 
             for (const auto& c : cm.get_compactions()) {
                 cm::summary s;
-                s.ks = c->ks_name;
-                s.cf = c->cf_name;
+                s.ks = c->ks;
+                s.cf = c->cf;
                 s.unit = "keys";
                 s.task_type = sstables::compaction_name(c->type);
                 s.completed = c->total_keys_written;
@@ -103,37 +103,29 @@ void set_compaction_manager(http_context& ctx, routes& r) {
     });
 
     cm::get_compaction_history.set(r, [] (std::unique_ptr<request> req) {
-        std::function<future<>(output_stream<char>&&)> f = [](output_stream<char>&& s) {
-            return do_with(output_stream<char>(std::move(s)), true, [] (output_stream<char>& s, bool& first){
-                return s.write("[").then([&s, &first] {
-                    return db::system_keyspace::get_compaction_history([&s, &first](const db::system_keyspace::compaction_history_entry& entry) mutable {
-                        cm::history h;
-                        h.id = entry.id.to_sstring();
-                        h.ks = std::move(entry.ks);
-                        h.cf = std::move(entry.cf);
-                        h.compacted_at = entry.compacted_at;
-                        h.bytes_in = entry.bytes_in;
-                        h.bytes_out =  entry.bytes_out;
-                        for (auto it : entry.rows_merged) {
-                            httpd::compaction_manager_json::row_merged e;
-                            e.key = it.first;
-                            e.value = it.second;
-                            h.rows_merged.push(std::move(e));
-                        }
-                        auto fut = first ? make_ready_future<>() : s.write(", ");
-                        first = false;
-                        return fut.then([&s, h = std::move(h)] {
-                            return formatter::write(s, h);
-                        });
-                    }).then([&s] {
-                        return s.write("]").then([&s] {
-                            return s.close();
-                        });
-                    });
-                });
-            });
-        };
-        return make_ready_future<json::json_return_type>(std::move(f));
+        return db::system_keyspace::get_compaction_history().then([] (std::vector<db::system_keyspace::compaction_history_entry> history) {
+            std::vector<cm::history> res;
+            res.reserve(history.size());
+
+            for (auto& entry : history) {
+                cm::history h;
+                h.id = entry.id.to_sstring();
+                h.ks = std::move(entry.ks);
+                h.cf = std::move(entry.cf);
+                h.compacted_at = entry.compacted_at;
+                h.bytes_in = entry.bytes_in;
+                h.bytes_out =  entry.bytes_out;
+                for (auto it : entry.rows_merged) {
+                    httpd::compaction_manager_json::row_merged e;
+                    e.key = it.first;
+                    e.value = it.second;
+                    h.rows_merged.push(std::move(e));
+                }
+                res.push_back(std::move(h));
+            }
+
+            return make_ready_future<json::json_return_type>(res);
+        });
     });
 
     cm::get_compaction_info.set(r, [] (std::unique_ptr<request> req) {

api/config.cc

@@ -1,113 +0,0 @@
-/*
- * Copyright 2018 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 "api/config.hh"
-#include "api/api-doc/config.json.hh"
-#include "db/config.hh"
-#include "database.hh"
-#include <sstream>
-#include <boost/algorithm/string/replace.hpp>
-
-namespace api {
-
-template<class T>
-json::json_return_type get_json_return_type(const T& val) {
-    return json::json_return_type(val);
-}
-
-/*
- * As commented on db::seed_provider_type is not used
- * and probably never will.
- *
- * Just in case, we will return its name
- */
-template<>
-json::json_return_type get_json_return_type(const db::seed_provider_type& val) {
-    return json::json_return_type(val.class_name);
-}
-
-std::string format_type(const std::string& type) {
-    if (type == "int") {
-        return "integer";
-    }
-    return type;
-}
-
-future<> get_config_swagger_entry(const std::string& name, const std::string& description, const std::string& type, bool& first, output_stream<char>& os) {
-    std::stringstream ss;
-    if (first) {
-        first=false;
-    } else {
-        ss <<',';
-    };
-    ss << "\"/config/" << name <<"\": {"
-      "\"get\": {"
-        "\"description\": \"" << boost::replace_all_copy(boost::replace_all_copy(boost::replace_all_copy(description,"\n","\\n"),"\"", "''"), "\t", " ") <<"\","
-        "\"operationId\": \"find_config_"<< name <<"\","
-        "\"produces\": ["
-          "\"application/json\""
-        "],"
-        "\"tags\": [\"config\"],"
-        "\"parameters\": ["
-        "],"
-        "\"responses\": {"
-          "\"200\": {"
-            "\"description\": \"Config value\","
-             "\"schema\": {"
-               "\"type\": \"" << format_type(type) << "\""
-             "}"
-          "},"
-          "\"default\": {"
-            "\"description\": \"unexpected error\","
-            "\"schema\": {"
-              "\"$ref\": \"#/definitions/ErrorModel\""
-            "}"
-          "}"
-        "}"
-      "}"
-    "}";
-    return os.write(ss.str());
-}
-
-namespace cs = httpd::config_json;
-#define _get_config_value(name, type, deflt, status, desc, ...) if (id == #name) {return get_json_return_type(ctx.db.local().get_config().name());}
-
-
-#define _get_config_description(name, type, deflt, status, desc, ...) f = f.then([&os, &first] {return get_config_swagger_entry(#name, desc, #type, first, os);});
-
-void set_config(std::shared_ptr < api_registry_builder20 > rb, http_context& ctx, routes& r) {
-    rb->register_function(r, [] (output_stream<char>& os) {
-        return do_with(true, [&os] (bool& first) {
-            auto f = make_ready_future();
-            _make_config_values(_get_config_description)
-            return f;
-        });
-    });
-
-    cs::find_config_id.set(r, [&ctx] (const_req r) {
-        auto id = r.param["id"];
-        _make_config_values(_get_config_value)
-        throw bad_param_exception(sstring("No such config entry: ") + id);
-    });
-}
-
-}
-

api/lsa.cc

@@ -23,7 +23,7 @@
 #include "api/lsa.hh"
 #include "api/api.hh"
 
-#include <seastar/http/exception.hh>
+#include "http/exception.hh"
 #include "utils/logalloc.hh"
 #include "log.hh"
 

api/messaging_service.cc

@@ -21,7 +21,7 @@
 
 #include "messaging_service.hh"
 #include "message/messaging_service.hh"
-#include <seastar/rpc/rpc_types.hh>
+#include "rpc/rpc_types.hh"
 #include "api/api-doc/messaging_service.json.hh"
 #include <iostream>
 #include <sstream>
@@ -139,7 +139,7 @@ void set_messaging_service(http_context& ctx, routes& r) {
                 messaging_verb v = i; // for type safety we use messaging_verb values
                 auto idx = static_cast<uint32_t>(v);
                 if (idx >= map->size()) {
-                    throw std::runtime_error(format("verb index out of bounds: {:d}, map size: {:d}", idx, map->size()));
+                    throw std::runtime_error(sprint("verb index out of bounds: %lu, map size: %lu", idx, map->size()));
                 }
                 if ((*map)[idx] > 0) {
                     c.count = (*map)[idx];

api/storage_proxy.cc

@@ -26,7 +26,6 @@
 #include "service/storage_service.hh"
 #include "db/config.hh"
 #include "utils/histogram.hh"
-#include "database.hh"
 
 namespace api {
 

api/storage_service.cc

@@ -28,17 +28,13 @@
 #include <db/commitlog/commitlog.hh>
 #include <gms/gossiper.hh>
 #include <db/system_keyspace.hh>
-#include <seastar/http/exception.hh>
+#include "http/exception.hh"
 #include "repair/repair.hh"
 #include "locator/snitch_base.hh"
 #include "column_family.hh"
 #include "log.hh"
 #include "release.hh"
 #include "sstables/compaction_manager.hh"
-#include "sstables/sstables.hh"
-#include "database.hh"
-
-sstables::sstable::version_types get_highest_supported_format();
 
 namespace api {
 
@@ -76,49 +72,31 @@ static std::vector<ss::token_range> describe_ring(const sstring& keyspace) {
 }
 
 void set_storage_service(http_context& ctx, routes& r) {
-    using ks_cf_func = std::function<future<json::json_return_type>(std::unique_ptr<request>, sstring, std::vector<sstring>)>;
-
-    auto wrap_ks_cf = [&ctx](ks_cf_func f) {
-        return [&ctx, f = std::move(f)](std::unique_ptr<request> req) {
-            auto keyspace = validate_keyspace(ctx, req->param);
-            auto column_families = split_cf(req->get_query_param("cf"));
-            if (column_families.empty()) {
-                column_families = map_keys(ctx.db.local().find_keyspace(keyspace).metadata().get()->cf_meta_data());
-            }
-            return f(std::move(req), std::move(keyspace), std::move(column_families));
-        };
-    };
-
     ss::local_hostid.set(r, [](std::unique_ptr<request> req) {
         return db::system_keyspace::get_local_host_id().then([](const utils::UUID& id) {
             return make_ready_future<json::json_return_type>(id.to_sstring());
         });
     });
 
-    ss::get_tokens.set(r, [] (std::unique_ptr<request> req) {
-        return make_ready_future<json::json_return_type>(stream_range_as_array(service::get_local_storage_service().get_token_metadata().sorted_tokens(), [](const dht::token& i) {
-           return boost::lexical_cast<std::string>(i);
-        }));
+    ss::get_tokens.set(r, [] (const_req req) {
+        auto tokens = service::get_local_storage_service().get_token_metadata().sorted_tokens();
+        return container_to_vec(tokens);
     });
 
-    ss::get_node_tokens.set(r, [] (std::unique_ptr<request> req) {
-        gms::inet_address addr(req->param["endpoint"]);
-        return make_ready_future<json::json_return_type>(stream_range_as_array(service::get_local_storage_service().get_token_metadata().get_tokens(addr), [](const dht::token& i) {
-           return boost::lexical_cast<std::string>(i);
-       }));
+    ss::get_node_tokens.set(r, [] (const_req req) {
+        gms::inet_address addr(req.param["endpoint"]);
+        auto tokens = service::get_local_storage_service().get_token_metadata().get_tokens(addr);
+        return container_to_vec(tokens);
     });
 
     ss::get_commitlog.set(r, [&ctx](const_req req) {
         return ctx.db.local().commitlog()->active_config().commit_log_location;
     });
 
-    ss::get_token_endpoint.set(r, [] (std::unique_ptr<request> req) {
-        return make_ready_future<json::json_return_type>(stream_range_as_array(service::get_local_storage_service().get_token_to_endpoint_map(), [](const auto& i) {
-            storage_service_json::mapper val;
-            val.key = boost::lexical_cast<std::string>(i.first);
-            val.value = boost::lexical_cast<std::string>(i.second);
-            return val;
-        }));
+    ss::get_token_endpoint.set(r, [] (const_req req) {
+        auto token_to_ep = service::get_local_storage_service().get_token_to_endpoint_map();
+        std::vector<storage_service_json::mapper> res;
+        return map_to_key_value(token_to_ep, res);
     });
 
     ss::get_leaving_nodes.set(r, [](const_req req) {
@@ -126,7 +104,11 @@ void set_storage_service(http_context& ctx, routes& r) {
     });
 
     ss::get_moving_nodes.set(r, [](const_req req) {
+        auto points = service::get_local_storage_service().get_token_metadata().get_moving_endpoints();
         std::unordered_set<sstring> addr;
+        for (auto i: points) {
+            addr.insert(boost::lexical_cast<std::string>(i.second));
+        }
         return container_to_vec(addr);
     });
 
@@ -316,44 +298,24 @@ void set_storage_service(http_context& ctx, routes& r) {
         });
     });
 
-    ss::scrub.set(r, wrap_ks_cf([&ctx](std::unique_ptr<request> req, sstring keyspace, std::vector<sstring> column_families) {
-        // TODO: respect this
+    ss::scrub.set(r, [&ctx](std::unique_ptr<request> req) {
+        //TBD
+        unimplemented();
+        auto keyspace = validate_keyspace(ctx, req->param);
+        auto column_family = req->get_query_param("cf");
+        auto disable_snapshot = req->get_query_param("disable_snapshot");
         auto skip_corrupted = req->get_query_param("skip_corrupted");
+        return make_ready_future<json::json_return_type>(json_void());
+    });
 
-        auto f = make_ready_future<>();
-        if (!req_param<bool>(*req, "disable_snapshot", false)) {
-            auto tag = format("pre-scrub-{:d}", db_clock::now().time_since_epoch().count());
-            f = parallel_for_each(column_families, [keyspace, tag](sstring cf) {
-                return service::get_local_storage_service().take_column_family_snapshot(keyspace, cf, tag);
-            });
-        }
-
-        return f.then([&ctx, keyspace, column_families] {
-            return ctx.db.invoke_on_all([=] (database& db) {
-                return do_for_each(column_families, [=, &db](sstring cfname) {
-                    auto& cm = db.get_compaction_manager();
-                    auto& cf = db.find_column_family(keyspace, cfname);
-                    return cm.perform_sstable_scrub(&cf);
-                });
-            });
-        }).then([]{
-            return make_ready_future<json::json_return_type>(0);
-        });
-    }));
-
-    ss::upgrade_sstables.set(r, wrap_ks_cf([&ctx](std::unique_ptr<request> req, sstring keyspace, std::vector<sstring> column_families) {
-        bool exclude_current_version = req_param<bool>(*req, "exclude_current_version", false);
-
-        return ctx.db.invoke_on_all([=] (database& db) {
-            return do_for_each(column_families, [=, &db](sstring cfname) {
-                auto& cm = db.get_compaction_manager();
-                auto& cf = db.find_column_family(keyspace, cfname);
-                return cm.perform_sstable_upgrade(&cf, exclude_current_version);
-            });
-        }).then([]{
-            return make_ready_future<json::json_return_type>(0);
-        });
-    }));
+    ss::upgrade_sstables.set(r, [&ctx](std::unique_ptr<request> req) {
+        //TBD
+        unimplemented();
+        auto keyspace = validate_keyspace(ctx, req->param);
+        auto column_family = req->get_query_param("cf");
+        auto exclude_current_version = req->get_query_param("exclude_current_version");
+        return make_ready_future<json::json_return_type>(json_void());
+    });
 
     ss::force_keyspace_flush.set(r, [&ctx](std::unique_ptr<request> req) {
         auto keyspace = validate_keyspace(ctx, req->param);
@@ -393,12 +355,6 @@ void set_storage_service(http_context& ctx, routes& r) {
                 });
     });
 
-    ss::get_active_repair_async.set(r, [&ctx](std::unique_ptr<request> req) {
-        return get_active_repairs(ctx.db).then([] (std::vector<int> res){
-            return make_ready_future<json::json_return_type>(res);
-        });
-    });
-
     ss::repair_async_status.set(r, [&ctx](std::unique_ptr<request> req) {
         return repair_get_status(ctx.db, boost::lexical_cast<int>( req->get_query_param("id")))
                 .then_wrapped([] (future<repair_status>&& fut) {
@@ -491,7 +447,7 @@ void set_storage_service(http_context& ctx, routes& r) {
         return service::get_storage_service().map_reduce(adder<service::storage_service::drain_progress>(), [] (auto& ss) {
             return ss.get_drain_progress();
         }).then([] (auto&& progress) {
-            auto progress_str = format("Drained {}/{} ColumnFamilies", progress.remaining_cfs, progress.total_cfs);
+            auto progress_str = sprint("Drained %s/%s ColumnFamilies", progress.remaining_cfs, progress.total_cfs);
             return make_ready_future<json::json_return_type>(std::move(progress_str));
         });
     });
@@ -702,11 +658,7 @@ void set_storage_service(http_context& ctx, routes& r) {
         auto coordinator = std::hash<sstring>()(cf) % smp::count;
         return service::get_storage_service().invoke_on(coordinator, [ks = std::move(ks), cf = std::move(cf)] (service::storage_service& s) {
             return s.load_new_sstables(ks, cf);
-        }).then_wrapped([] (auto&& f) {
-            if (f.failed()) {
-                auto msg = fmt::format("Failed to load new sstables: {}", f.get_exception());
-                return make_exception_future<json::json_return_type>(httpd::server_error_exception(msg));
-            }
+        }).then([] {
             return make_ready_future<json::json_return_type>(json_void());
         });
     });
@@ -740,7 +692,7 @@ void set_storage_service(http_context& ctx, routes& r) {
             } catch (std::out_of_range& e) {
                 throw httpd::bad_param_exception(e.what());
             } catch (std::invalid_argument&){
-                throw httpd::bad_param_exception(format("Bad format in a probability value: \"{}\"", probability.c_str()));
+                throw httpd::bad_param_exception(sprint("Bad format in a probability value: \"%s\"", probability.c_str()));
             }
         });
     });
@@ -776,7 +728,7 @@ void set_storage_service(http_context& ctx, routes& r) {
                 return make_ready_future<json::json_return_type>(json_void());
             });
         } catch (...) {
-            throw httpd::bad_param_exception(format("Bad format value: "));
+            throw httpd::bad_param_exception(sprint("Bad format value: "));
         }
     });
 
@@ -891,15 +843,6 @@ void set_storage_service(http_context& ctx, routes& r) {
             return make_ready_future<json::json_return_type>(map_to_key_value(ownership, res));
         });
     });
-
-    ss::view_build_statuses.set(r, [&ctx] (std::unique_ptr<request> req) {
-        auto keyspace = validate_keyspace(ctx, req->param);
-        auto view = req->param["view"];
-        return service::get_local_storage_service().view_build_statuses(std::move(keyspace), std::move(view)).then([] (std::unordered_map<sstring, sstring> status) {
-            std::vector<storage_service_json::mapper> res;
-            return make_ready_future<json::json_return_type>(map_to_key_value(std::move(status), res));
-        });
-    });
 }
 
 }

api/system.cc

@@ -22,7 +22,7 @@
 #include "api/api-doc/system.json.hh"
 #include "api/api.hh"
 
-#include <seastar/http/exception.hh>
+#include "http/exception.hh"
 #include "log.hh"
 
 namespace api {

atomic_cell.cc

@@ -1,261 +0,0 @@
-/*
- * Copyright (C) 2018 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 "atomic_cell.hh"
-#include "atomic_cell_or_collection.hh"
-#include "types.hh"
-#include "types/collection.hh"
-
-/// LSA mirator for cells with irrelevant type
-///
-///
-const data::type_imr_descriptor& no_type_imr_descriptor() {
-    static thread_local data::type_imr_descriptor state(data::type_info::make_variable_size());
-    return state;
-}
-
-atomic_cell atomic_cell::make_dead(api::timestamp_type timestamp, gc_clock::time_point deletion_time) {
-    auto& imr_data = no_type_imr_descriptor();
-    return atomic_cell(
-            imr_data.type_info(),
-            imr_object_type::make(data::cell::make_dead(timestamp, deletion_time), &imr_data.lsa_migrator())
-    );
-}
-
-atomic_cell atomic_cell::make_live(const abstract_type& type, api::timestamp_type timestamp, bytes_view value, atomic_cell::collection_member cm) {
-    auto& imr_data = type.imr_state();
-    return atomic_cell(
-        imr_data.type_info(),
-        imr_object_type::make(data::cell::make_live(imr_data.type_info(), timestamp, value, bool(cm)), &imr_data.lsa_migrator())
-    );
-}
-
-atomic_cell atomic_cell::make_live(const abstract_type& type, api::timestamp_type timestamp, ser::buffer_view<bytes_ostream::fragment_iterator> value, atomic_cell::collection_member cm) {
-    auto& imr_data = type.imr_state();
-    return atomic_cell(
-        imr_data.type_info(),
-        imr_object_type::make(data::cell::make_live(imr_data.type_info(), timestamp, value, bool(cm)), &imr_data.lsa_migrator())
-    );
-}
-
-atomic_cell atomic_cell::make_live(const abstract_type& type, api::timestamp_type timestamp, const fragmented_temporary_buffer::view& value, collection_member cm)
-{
-    auto& imr_data = type.imr_state();
-    return atomic_cell(
-        imr_data.type_info(),
-        imr_object_type::make(data::cell::make_live(imr_data.type_info(), timestamp, value, bool(cm)), &imr_data.lsa_migrator())
-    );
-}
-
-atomic_cell atomic_cell::make_live(const abstract_type& type, api::timestamp_type timestamp, bytes_view value,
-                             gc_clock::time_point expiry, gc_clock::duration ttl, atomic_cell::collection_member cm) {
-    auto& imr_data = type.imr_state();
-    return atomic_cell(
-        imr_data.type_info(),
-        imr_object_type::make(data::cell::make_live(imr_data.type_info(), timestamp, value, expiry, ttl, bool(cm)), &imr_data.lsa_migrator())
-    );
-}
-
-atomic_cell atomic_cell::make_live(const abstract_type& type, api::timestamp_type timestamp, ser::buffer_view<bytes_ostream::fragment_iterator> value,
-                             gc_clock::time_point expiry, gc_clock::duration ttl, atomic_cell::collection_member cm) {
-    auto& imr_data = type.imr_state();
-    return atomic_cell(
-        imr_data.type_info(),
-        imr_object_type::make(data::cell::make_live(imr_data.type_info(), timestamp, value, expiry, ttl, bool(cm)), &imr_data.lsa_migrator())
-    );
-}
-
-atomic_cell atomic_cell::make_live(const abstract_type& type, api::timestamp_type timestamp, const fragmented_temporary_buffer::view& value,
-                                   gc_clock::time_point expiry, gc_clock::duration ttl, collection_member cm)
-{
-    auto& imr_data = type.imr_state();
-    return atomic_cell(
-        imr_data.type_info(),
-        imr_object_type::make(data::cell::make_live(imr_data.type_info(), timestamp, value, expiry, ttl, bool(cm)), &imr_data.lsa_migrator())
-    );
-}
-
-atomic_cell atomic_cell::make_live_counter_update(api::timestamp_type timestamp, int64_t value) {
-    auto& imr_data = no_type_imr_descriptor();
-    return atomic_cell(
-        imr_data.type_info(),
-        imr_object_type::make(data::cell::make_live_counter_update(timestamp, value), &imr_data.lsa_migrator())
-    );
-}
-
-atomic_cell atomic_cell::make_live_uninitialized(const abstract_type& type, api::timestamp_type timestamp, size_t size) {
-    auto& imr_data = no_type_imr_descriptor();
-    return atomic_cell(
-        imr_data.type_info(),
-        imr_object_type::make(data::cell::make_live_uninitialized(imr_data.type_info(), timestamp, size), &imr_data.lsa_migrator())
-    );
-}
-
-static imr::utils::object<data::cell::structure> copy_cell(const data::type_imr_descriptor& imr_data, const uint8_t* ptr)
-{
-    using imr_object_type = imr::utils::object<data::cell::structure>;
-
-    // If the cell doesn't own any memory it is trivial and can be copied with
-    // memcpy.
-    auto f = data::cell::structure::get_member<data::cell::tags::flags>(ptr);
-    if (!f.template get<data::cell::tags::external_data>()) {
-        data::cell::context ctx(f, imr_data.type_info());
-        // XXX: We may be better off storing the total cell size in memory. Measure!
-        auto size = data::cell::structure::serialized_object_size(ptr, ctx);
-        return imr_object_type::make_raw(size, [&] (uint8_t* dst) noexcept {
-            std::copy_n(ptr, size, dst);
-        }, &imr_data.lsa_migrator());
-    }
-
-    return imr_object_type::make(data::cell::copy_fn(imr_data.type_info(), ptr), &imr_data.lsa_migrator());
-}
-
-atomic_cell::atomic_cell(const abstract_type& type, atomic_cell_view other)
-    : atomic_cell(type.imr_state().type_info(),
-                  copy_cell(type.imr_state(), other._view.raw_pointer()))
-{ }
-
-atomic_cell_or_collection atomic_cell_or_collection::copy(const abstract_type& type) const {
-    if (!_data.get()) {
-        return atomic_cell_or_collection();
-    }
-    auto& imr_data = type.imr_state();
-    return atomic_cell_or_collection(
-        copy_cell(imr_data, _data.get())
-    );
-}
-
-atomic_cell_or_collection::atomic_cell_or_collection(const abstract_type& type, atomic_cell_view acv)
-    : _data(copy_cell(type.imr_state(), acv._view.raw_pointer()))
-{
-}
-
-static collection_mutation_view get_collection_mutation_view(const uint8_t* ptr)
-{
-    auto f = data::cell::structure::get_member<data::cell::tags::flags>(ptr);
-    auto ti = data::type_info::make_collection();
-    data::cell::context ctx(f, ti);
-    auto view = data::cell::structure::get_member<data::cell::tags::cell>(ptr).as<data::cell::tags::collection>(ctx);
-    auto dv = data::cell::variable_value::make_view(view, f.get<data::cell::tags::external_data>());
-    return collection_mutation_view { dv };
-}
-
-collection_mutation_view atomic_cell_or_collection::as_collection_mutation() const {
-    return get_collection_mutation_view(_data.get());
-}
-
-collection_mutation::collection_mutation(const collection_type_impl& type, collection_mutation_view v)
-    : _data(imr_object_type::make(data::cell::make_collection(v.data), &type.imr_state().lsa_migrator()))
-{
-}
-
-collection_mutation::collection_mutation(const collection_type_impl& type, bytes_view v)
-    : _data(imr_object_type::make(data::cell::make_collection(v), &type.imr_state().lsa_migrator()))
-{
-}
-
-collection_mutation::operator collection_mutation_view() const
-{
-    return get_collection_mutation_view(_data.get());
-}
-
-bool atomic_cell_or_collection::equals(const abstract_type& type, const atomic_cell_or_collection& other) const
-{
-    auto ptr_a = _data.get();
-    auto ptr_b = other._data.get();
-
-    if (!ptr_a || !ptr_b) {
-        return !ptr_a && !ptr_b;
-    }
-
-    if (type.is_atomic()) {
-        auto a = atomic_cell_view::from_bytes(type.imr_state().type_info(), _data);
-        auto b = atomic_cell_view::from_bytes(type.imr_state().type_info(), other._data);
-        if (a.timestamp() != b.timestamp()) {
-            return false;
-        }
-        if (a.is_live() != b.is_live()) {
-            return false;
-        }
-        if (a.is_live()) {
-            if (a.is_counter_update() != b.is_counter_update()) {
-                return false;
-            }
-            if (a.is_counter_update()) {
-                return a.counter_update_value() == b.counter_update_value();
-            }
-            if (a.is_live_and_has_ttl() != b.is_live_and_has_ttl()) {
-                return false;
-            }
-            if (a.is_live_and_has_ttl()) {
-                if (a.ttl() != b.ttl() || a.expiry() != b.expiry()) {
-                    return false;
-                }
-            }
-            return a.value() == b.value();
-        }
-        return a.deletion_time() == b.deletion_time();
-    } else {
-        return as_collection_mutation().data == other.as_collection_mutation().data;
-    }
-}
-
-size_t atomic_cell_or_collection::external_memory_usage(const abstract_type& t) const
-{
-    if (!_data.get()) {
-        return 0;
-    }
-    auto ctx = data::cell::context(_data.get(), t.imr_state().type_info());
-
-    auto view = data::cell::structure::make_view(_data.get(), ctx);
-    auto flags = view.get<data::cell::tags::flags>();
-
-    size_t external_value_size = 0;
-    if (flags.get<data::cell::tags::external_data>()) {
-        if (flags.get<data::cell::tags::collection>()) {
-            external_value_size = get_collection_mutation_view(_data.get()).data.size_bytes();
-        } else {
-            auto cell_view = data::cell::atomic_cell_view(t.imr_state().type_info(), view);
-            external_value_size = cell_view.value_size();
-        }
-        // Add overhead of chunk headers. The last one is a special case.
-        external_value_size += (external_value_size - 1) / data::cell::maximum_external_chunk_length * data::cell::external_chunk_overhead;
-        external_value_size += data::cell::external_last_chunk_overhead;
-    }
-    return data::cell::structure::serialized_object_size(_data.get(), ctx)
-        + imr_object_type::size_overhead + external_value_size;
-}
-
-std::ostream& operator<<(std::ostream& os, const atomic_cell_or_collection::printer& p) {
-    if (!p._cell._data.get()) {
-        return os << "{ null atomic_cell_or_collection }";
-    }
-    using dc = data::cell;
-    os << "{ ";
-    if (dc::structure::get_member<dc::tags::flags>(p._cell._data.get()).get<dc::tags::collection>()) {
-        os << "collection ";
-        auto cmv = p._cell.as_collection_mutation();
-        os << to_hex(cmv.data.linearize());
-    } else {
-        os << p._cell.as_atomic_cell(p._cdef);
-    }
-    return os << " }";
-}

atomic_cell.hh

@@ -26,55 +26,204 @@
 #include "tombstone.hh"
 #include "gc_clock.hh"
 #include "utils/managed_bytes.hh"
-#include <seastar/net//byteorder.hh>
+#include "net/byteorder.hh"
 #include <cstdint>
 #include <iosfwd>
 #include <seastar/util/gcc6-concepts.hh>
-#include "data/cell.hh"
-#include "data/schema_info.hh"
-#include "imr/utils.hh"
-#include "utils/fragmented_temporary_buffer.hh"
 
-#include "serializer.hh"
+template<typename T, typename Input>
+static inline
+void set_field(Input& v, unsigned offset, T val) {
+    reinterpret_cast<net::packed<T>*>(v.begin() + offset)->raw = net::hton(val);
+}
 
-class abstract_type;
-class collection_type_impl;
+template<typename T>
+static inline
+T get_field(const bytes_view& v, unsigned offset) {
+    return net::ntoh(*reinterpret_cast<const net::packed<T>*>(v.begin() + offset));
+}
 
-using atomic_cell_value_view = data::value_view;
-using atomic_cell_value_mutable_view = data::value_mutable_view;
+class atomic_cell_or_collection;
 
-/// View of an atomic cell
-template<mutable_view is_mutable>
-class basic_atomic_cell_view {
-protected:
-    data::cell::basic_atomic_cell_view<is_mutable> _view;
-    friend class atomic_cell;
+/*
+ * Represents atomic cell layout. Works on serialized form.
+ *
+ * Layout:
+ *
+ *  <live>  := <int8_t:flags><int64_t:timestamp>(<int32_t:expiry><int32_t:ttl>)?<value>
+ *  <dead>  := <int8_t:    0><int64_t:timestamp><int32_t:deletion_time>
+ */
+class atomic_cell_type final {
+private:
+    static constexpr int8_t LIVE_FLAG = 0x01;
+    static constexpr int8_t EXPIRY_FLAG = 0x02; // When present, expiry field is present. Set only for live cells
+    static constexpr int8_t REVERT_FLAG = 0x04; // transient flag used to efficiently implement ReversiblyMergeable for atomic cells.
+    static constexpr 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;
+    static constexpr unsigned expiry_offset = timestamp_offset + timestamp_size;
+    static constexpr unsigned expiry_size = 4;
+    static constexpr unsigned deletion_time_offset = timestamp_offset + timestamp_size;
+    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;
+    }
+    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;
+    }
+    static bool is_live_and_has_ttl(const bytes_view& cell) {
+        return cell[0] & EXPIRY_FLAG;
+    }
+    static bool is_dead(const bytes_view& cell) {
+        return !is_live(cell);
+    }
+    // Can be called on live and dead cells
+    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) {
+        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:
-    using pointer_type = std::conditional_t<is_mutable == mutable_view::no, const uint8_t*, uint8_t*>;
+    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));
+        return gc_clock::time_point(gc_clock::duration(
+            get_field<int32_t>(cell, deletion_time_offset)));
+    }
+    // Can be called only when is_live_and_has_ttl() is true.
+    static gc_clock::time_point expiry(const bytes_view& cell) {
+        assert(is_live_and_has_ttl(cell));
+        auto expiry = get_field<int32_t>(cell, expiry_offset);
+        return gc_clock::time_point(gc_clock::duration(expiry));
+    }
+    // Can be called only when is_live_and_has_ttl() is true.
+    static gc_clock::duration ttl(const bytes_view& cell) {
+        assert(is_live_and_has_ttl(cell));
+        return gc_clock::duration(get_field<int32_t>(cell, ttl_offset));
+    }
+    static managed_bytes make_dead(api::timestamp_type timestamp, gc_clock::time_point deletion_time) {
+        managed_bytes b(managed_bytes::initialized_later(), flags_size + timestamp_size + deletion_time_size);
+        b[0] = 0;
+        set_field(b, timestamp_offset, timestamp);
+        set_field(b, deletion_time_offset, deletion_time.time_since_epoch().count());
+        return b;
+    }
+    static managed_bytes make_live(api::timestamp_type timestamp, bytes_view value) {
+        auto value_offset = flags_size + timestamp_size;
+        managed_bytes b(managed_bytes::initialized_later(), value_offset + value.size());
+        b[0] = LIVE_FLAG;
+        set_field(b, timestamp_offset, timestamp);
+        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) {
+        auto value_offset = flags_size + timestamp_size;
+        managed_bytes b(managed_bytes::initialized_later(), value_offset + sizeof(value));
+        b[0] = LIVE_FLAG | COUNTER_UPDATE_FLAG;
+        set_field(b, timestamp_offset, timestamp);
+        set_field(b, value_offset, value);
+        return b;
+    }
+    static managed_bytes make_live(api::timestamp_type timestamp, bytes_view value, gc_clock::time_point expiry, gc_clock::duration ttl) {
+        auto value_offset = flags_size + timestamp_size + expiry_size + ttl_size;
+        managed_bytes b(managed_bytes::initialized_later(), value_offset + value.size());
+        b[0] = EXPIRY_FLAG | LIVE_FLAG;
+        set_field(b, timestamp_offset, timestamp);
+        set_field(b, expiry_offset, expiry.time_since_epoch().count());
+        set_field(b, ttl_offset, ttl.count());
+        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;
+};
+
+template<typename ByteContainer>
+class atomic_cell_base {
 protected:
-    explicit basic_atomic_cell_view(data::cell::basic_atomic_cell_view<is_mutable> v)
-        : _view(std::move(v)) { }
-
-    basic_atomic_cell_view(const data::type_info& ti, pointer_type ptr)
-        : _view(data::cell::make_atomic_cell_view(ti, ptr))
-    { }
-
+    ByteContainer _data;
+protected:
+    atomic_cell_base(ByteContainer&& data) : _data(std::forward<ByteContainer>(data)) { }
     friend class atomic_cell_or_collection;
 public:
-    operator basic_atomic_cell_view<mutable_view::no>() const noexcept {
-        return basic_atomic_cell_view<mutable_view::no>(_view);
-    }
-
-    void swap(basic_atomic_cell_view& other) noexcept {
-        using std::swap;
-        swap(_view, other._view);
-    }
-
     bool is_counter_update() const {
-        return _view.is_counter_update();
+        return atomic_cell_type::is_counter_update(_data);
+    }
+    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 _view.is_live();
+        return atomic_cell_type::is_live(_data);
     }
     bool is_live(tombstone t, bool is_counter) const {
         return is_live() && !is_covered_by(t, is_counter);
@@ -83,140 +232,125 @@ public:
         return is_live() && !is_covered_by(t, is_counter) && !has_expired(now);
     }
     bool is_live_and_has_ttl() const {
-        return _view.is_expiring();
+        return atomic_cell_type::is_live_and_has_ttl(_data);
     }
     bool is_dead(gc_clock::time_point now) const {
-        return !is_live() || has_expired(now);
+        return atomic_cell_type::is_dead(_data) || has_expired(now);
     }
     bool is_covered_by(tombstone t, bool is_counter) const {
         return timestamp() <= t.timestamp || (is_counter && t.timestamp != api::missing_timestamp);
     }
     // Can be called on live and dead cells
     api::timestamp_type timestamp() const {
-        return _view.timestamp();
+        return atomic_cell_type::timestamp(_data);
     }
     void set_timestamp(api::timestamp_type ts) {
-        _view.set_timestamp(ts);
+        atomic_cell_type::set_timestamp(_data, ts);
     }
     // Can be called on live cells only
-    data::basic_value_view<is_mutable> value() const {
-        return _view.value();
-    }
-    // Can be called on live cells only
-    size_t value_size() const {
-        return _view.value_size();
-    }
-    bool is_value_fragmented() const {
-        return _view.is_value_fragmented();
+    auto value() const {
+        return atomic_cell_type::value(_data);
     }
     // Can be called on live counter update cells only
     int64_t counter_update_value() const {
-        return _view.counter_update_value();
+        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() ? _view.deletion_time() : expiry() - ttl();
+        return !is_live() ? atomic_cell_type::deletion_time(_data) : expiry() - ttl();
     }
     // Can be called only when is_live_and_has_ttl()
     gc_clock::time_point expiry() const {
-        return _view.expiry();
+        return atomic_cell_type::expiry(_data);
     }
     // Can be called only when is_live_and_has_ttl()
     gc_clock::duration ttl() const {
-        return _view.ttl();
+        return atomic_cell_type::ttl(_data);
     }
     // 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;
     }
-
     bytes_view serialize() const {
-        return _view.serialize();
+        return _data;
+    }
+    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 basic_atomic_cell_view<mutable_view::no> {
-    atomic_cell_view(const data::type_info& ti, const uint8_t* data)
-        : basic_atomic_cell_view<mutable_view::no>(ti, data) {}
-
-    template<mutable_view is_mutable>
-    atomic_cell_view(data::cell::basic_atomic_cell_view<is_mutable> view)
-        : basic_atomic_cell_view<mutable_view::no>(view) { }
-    friend class atomic_cell;
+class atomic_cell_view final : public atomic_cell_base<bytes_view> {
+    atomic_cell_view(bytes_view data) : atomic_cell_base(std::move(data)) {}
 public:
-    static atomic_cell_view from_bytes(const data::type_info& ti, const imr::utils::object<data::cell::structure>& data) {
-        return atomic_cell_view(ti, data.get());
-    }
-
-    static atomic_cell_view from_bytes(const data::type_info& ti, bytes_view bv) {
-        return atomic_cell_view(ti, reinterpret_cast<const uint8_t*>(bv.begin()));
-    }
+    static atomic_cell_view from_bytes(bytes_view data) { return atomic_cell_view(data); }
 
+    friend class atomic_cell;
     friend std::ostream& operator<<(std::ostream& os, const atomic_cell_view& acv);
 };
 
-class atomic_cell_mutable_view final : public basic_atomic_cell_view<mutable_view::yes> {
-    atomic_cell_mutable_view(const data::type_info& ti, uint8_t* data)
-        : basic_atomic_cell_view<mutable_view::yes>(ti, data) {}
+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(const data::type_info& ti, imr::utils::object<data::cell::structure>& data) {
-        return atomic_cell_mutable_view(ti, data.get());
-    }
+    static atomic_cell_mutable_view from_bytes(bytes_mutable_view data) { return atomic_cell_mutable_view(data); }
 
     friend class atomic_cell;
 };
 
-using atomic_cell_ref = atomic_cell_mutable_view;
-
-class atomic_cell final : public basic_atomic_cell_view<mutable_view::yes> {
-    using imr_object_type =  imr::utils::object<data::cell::structure>;
-    imr_object_type _data;
-    atomic_cell(const data::type_info& ti, imr::utils::object<data::cell::structure>&& data)
-        : basic_atomic_cell_view<mutable_view::yes>(ti, data.get()), _data(std::move(data)) {}
+class atomic_cell_ref final : public atomic_cell_base<managed_bytes&> {
 public:
-    class collection_member_tag;
-    using collection_member = bool_class<collection_member_tag>;
+    atomic_cell_ref(managed_bytes& buf) : atomic_cell_base(buf) {}
+};
 
+class atomic_cell final : public atomic_cell_base<managed_bytes> {
+    atomic_cell(managed_bytes b) : atomic_cell_base(std::move(b)) {}
+public:
+    atomic_cell(const atomic_cell&) = default;
     atomic_cell(atomic_cell&&) = default;
-    atomic_cell& operator=(const atomic_cell&) = delete;
+    atomic_cell& operator=(const atomic_cell&) = default;
     atomic_cell& operator=(atomic_cell&&) = default;
-    void swap(atomic_cell& other) noexcept {
-        basic_atomic_cell_view<mutable_view::yes>::swap(other);
-        _data.swap(other._data);
+    static atomic_cell from_bytes(managed_bytes b) {
+        return atomic_cell(std::move(b));
     }
-    operator atomic_cell_view() const { return atomic_cell_view(_view); }
-    atomic_cell(const abstract_type& t, atomic_cell_view other);
-    static atomic_cell make_dead(api::timestamp_type timestamp, gc_clock::time_point deletion_time);
-    static atomic_cell make_live(const abstract_type& type, api::timestamp_type timestamp, bytes_view value,
-                                 collection_member = collection_member::no);
-    static atomic_cell make_live(const abstract_type& type, api::timestamp_type timestamp, ser::buffer_view<bytes_ostream::fragment_iterator> value,
-                                 collection_member = collection_member::no);
-    static atomic_cell make_live(const abstract_type& type, api::timestamp_type timestamp, const fragmented_temporary_buffer::view& value,
-                                 collection_member = collection_member::no);
-    static atomic_cell make_live(const abstract_type& type, api::timestamp_type timestamp, const bytes& value,
-                                 collection_member cm = collection_member::no) {
-        return make_live(type, timestamp, bytes_view(value), cm);
+    atomic_cell(atomic_cell_view other) : atomic_cell_base(managed_bytes{other._data}) {}
+    operator atomic_cell_view() const {
+        return atomic_cell_view(_data);
     }
-    static atomic_cell make_live_counter_update(api::timestamp_type timestamp, int64_t value);
-    static atomic_cell make_live(const abstract_type&, api::timestamp_type timestamp, bytes_view value,
-        gc_clock::time_point expiry, gc_clock::duration ttl, collection_member = collection_member::no);
-    static atomic_cell make_live(const abstract_type&, api::timestamp_type timestamp, ser::buffer_view<bytes_ostream::fragment_iterator> value,
-        gc_clock::time_point expiry, gc_clock::duration ttl, collection_member = collection_member::no);
-    static atomic_cell make_live(const abstract_type&, api::timestamp_type timestamp, const fragmented_temporary_buffer::view& value,
-        gc_clock::time_point expiry, gc_clock::duration ttl, collection_member = collection_member::no);
-    static atomic_cell make_live(const abstract_type& type, api::timestamp_type timestamp, const bytes& value,
-                                 gc_clock::time_point expiry, gc_clock::duration ttl, collection_member cm = collection_member::no)
+    static atomic_cell make_dead(api::timestamp_type timestamp, gc_clock::time_point deletion_time) {
+        return atomic_cell_type::make_dead(timestamp, deletion_time);
+    }
+    static atomic_cell make_live(api::timestamp_type timestamp, bytes_view value) {
+        return atomic_cell_type::make_live(timestamp, value);
+    }
+    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) {
+        return atomic_cell_type::make_live_counter_update(timestamp, value);
+    }
+    static atomic_cell make_live(api::timestamp_type timestamp, bytes_view value,
+        gc_clock::time_point expiry, gc_clock::duration ttl)
     {
-        return make_live(type, timestamp, bytes_view(value), expiry, ttl, cm);
+        return atomic_cell_type::make_live(timestamp, value, expiry, ttl);
     }
-    static atomic_cell make_live(const abstract_type& type, api::timestamp_type timestamp, bytes_view value, ttl_opt ttl, collection_member cm = collection_member::no) {
+    static atomic_cell make_live(api::timestamp_type timestamp, const bytes& value,
+                                 gc_clock::time_point expiry, gc_clock::duration ttl)
+    {
+        return make_live(timestamp, bytes_view(value), expiry, ttl);
+    }
+    static atomic_cell make_live(api::timestamp_type timestamp, bytes_view value, ttl_opt ttl) {
         if (!ttl) {
-            return make_live(type, timestamp, value, cm);
+            return atomic_cell_type::make_live(timestamp, value);
         } else {
-            return make_live(type, timestamp, value, gc_clock::now() + *ttl, *ttl, cm);
+            return atomic_cell_type::make_live(timestamp, value, gc_clock::now() + *ttl, *ttl);
         }
     }
-    static atomic_cell make_live_uninitialized(const abstract_type& type, api::timestamp_type timestamp, size_t size);
+    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);
 };
@@ -230,24 +364,33 @@ class collection_mutation_view;
 //   list: tbd, probably ugly
 class collection_mutation {
 public:
-    using imr_object_type =  imr::utils::object<data::cell::structure>;
-    imr_object_type _data;
-
+    managed_bytes data;
     collection_mutation() {}
-    collection_mutation(const collection_type_impl&, collection_mutation_view v);
-    collection_mutation(const collection_type_impl&, bytes_view bv);
+    collection_mutation(managed_bytes b) : data(std::move(b)) {}
+    collection_mutation(collection_mutation_view v);
     operator collection_mutation_view() const;
 };
 
-
 class collection_mutation_view {
 public:
-    atomic_cell_value_view data;
+    bytes_view data;
+    bytes_view serialize() const { return data; }
+    static collection_mutation_view from_bytes(bytes_view v) { return { v }; }
 };
 
+inline
+collection_mutation::collection_mutation(collection_mutation_view v)
+        : data(v.data) {
+}
+
+inline
+collection_mutation::operator collection_mutation_view() const {
+    return { data };
+}
+
 class column_definition;
 
 int compare_atomic_cell_for_merge(atomic_cell_view left, atomic_cell_view right);
-void merge_column(const abstract_type& def,
+void merge_column(const column_definition& def,
         atomic_cell_or_collection& old,
         const atomic_cell_or_collection& neww);

atomic_cell_hash.hh

@@ -24,9 +24,7 @@
 // Not part of atomic_cell.hh to avoid cyclic dependency between types.hh and atomic_cell.hh
 
 #include "types.hh"
-#include "types/collection.hh"
 #include "atomic_cell.hh"
-#include "atomic_cell_or_collection.hh"
 #include "hashing.hh"
 #include "counters.hh"
 
@@ -34,15 +32,12 @@ template<>
 struct appending_hash<collection_mutation_view> {
     template<typename Hasher>
     void operator()(Hasher& h, collection_mutation_view cell, const column_definition& cdef) const {
-      cell.data.with_linearized([&] (bytes_view cell_bv) {
-        auto ctype = static_pointer_cast<const collection_type_impl>(cdef.type);
-        auto m_view = ctype->deserialize_mutation_form(cell_bv);
+        auto m_view = collection_type_impl::deserialize_mutation_form(cell);
         ::feed_hash(h, m_view.tomb);
         for (auto&& key_and_value : m_view.cells) {
             ::feed_hash(h, key_and_value.first);
             ::feed_hash(h, key_and_value.second, cdef);
         }
-      });
     }
 };
 
@@ -54,9 +49,7 @@ struct appending_hash<atomic_cell_view> {
         feed_hash(h, cell.timestamp());
         if (cell.is_live()) {
             if (cdef.is_counter()) {
-                counter_cell_view::with_linearized(cell, [&] (counter_cell_view ccv) {
-                    ::feed_hash(h, ccv);
-                });
+                ::feed_hash(h, counter_cell_view(cell));
                 return;
             }
             if (cell.is_live_and_has_ttl()) {
@@ -85,15 +78,3 @@ struct appending_hash<collection_mutation> {
         feed_hash(h, static_cast<collection_mutation_view>(cm), cdef);
     }
 };
-
-template<>
-struct appending_hash<atomic_cell_or_collection> {
-    template<typename Hasher>
-    void operator()(Hasher& h, const atomic_cell_or_collection& c, const column_definition& cdef) const {
-        if (cdef.is_atomic()) {
-            feed_hash(h, c.as_atomic_cell(cdef), cdef);
-        } else {
-            feed_hash(h, c.as_collection_mutation(), cdef);
-        }
-    }
-};

atomic_cell_or_collection.hh

@@ -25,68 +25,50 @@
 #include "schema.hh"
 #include "hashing.hh"
 
-#include "imr/utils.hh"
-
 // A variant type that can hold either an atomic_cell, or a serialized collection.
 // Which type is stored is determined by the schema.
+// Has an "empty" state.
+// Objects moved-from are left in an empty state.
 class atomic_cell_or_collection final {
-    // FIXME: This has made us lose small-buffer optimisation. Unfortunately,
-    // due to the changed cell format it would be less effective now, anyway.
-    // Measure the actual impact because any attempts to fix this will become
-    // irrelevant once rows are converted to the IMR as well, so maybe we can
-    // live with this like that.
-    using imr_object_type = imr::utils::object<data::cell::structure>;
-    imr_object_type _data;
+    managed_bytes _data;
 private:
-    atomic_cell_or_collection(imr::utils::object<data::cell::structure>&& data) : _data(std::move(data)) {}
+    atomic_cell_or_collection(managed_bytes&& data) : _data(std::move(data)) {}
 public:
     atomic_cell_or_collection() = default;
-    atomic_cell_or_collection(atomic_cell_or_collection&&) = default;
-    atomic_cell_or_collection(const atomic_cell_or_collection&) = delete;
-    atomic_cell_or_collection& operator=(atomic_cell_or_collection&&) = default;
-    atomic_cell_or_collection& operator=(const atomic_cell_or_collection&) = delete;
     atomic_cell_or_collection(atomic_cell ac) : _data(std::move(ac._data)) {}
-    atomic_cell_or_collection(const abstract_type& at, atomic_cell_view acv);
     static atomic_cell_or_collection from_atomic_cell(atomic_cell data) { return { std::move(data._data) }; }
-    atomic_cell_view as_atomic_cell(const column_definition& cdef) const { return atomic_cell_view::from_bytes(cdef.type->imr_state().type_info(), _data); }
-    atomic_cell_ref as_atomic_cell_ref(const column_definition& cdef) { return atomic_cell_mutable_view::from_bytes(cdef.type->imr_state().type_info(), _data); }
-    atomic_cell_mutable_view as_mutable_atomic_cell(const column_definition& cdef) { return atomic_cell_mutable_view::from_bytes(cdef.type->imr_state().type_info(), _data); }
-    atomic_cell_or_collection(collection_mutation cm) : _data(std::move(cm._data)) { }
-    atomic_cell_or_collection copy(const abstract_type&) const;
+    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 bool(_data);
+        return !_data.empty();
     }
-    static constexpr bool can_use_mutable_view() {
-        return true;
+    bool can_use_mutable_view() const {
+        return !_data.is_fragmented();
     }
-    void swap(atomic_cell_or_collection& other) noexcept {
-        _data.swap(other._data);
+    static atomic_cell_or_collection from_collection_mutation(collection_mutation data) {
+        return std::move(data.data);
     }
-    static atomic_cell_or_collection from_collection_mutation(collection_mutation data) { return std::move(data._data); }
-    collection_mutation_view as_collection_mutation() const;
-    bytes_view serialize() const;
-    bool equals(const abstract_type& type, const atomic_cell_or_collection& other) const;
-    size_t external_memory_usage(const abstract_type&) const;
-
-    class printer {
-        const column_definition& _cdef;
-        const atomic_cell_or_collection& _cell;
-    public:
-        printer(const column_definition& cdef, const atomic_cell_or_collection& cell)
-            : _cdef(cdef), _cell(cell) { }
-        printer(const printer&) = delete;
-        printer(printer&&) = delete;
-
-        friend std::ostream& operator<<(std::ostream&, const printer&);
-    };
-    friend std::ostream& operator<<(std::ostream&, const printer&);
+    collection_mutation_view as_collection_mutation() const {
+        return collection_mutation_view{_data};
+    }
+    bytes_view serialize() const {
+        return _data;
+    }
+    bool operator==(const atomic_cell_or_collection& other) const {
+        return _data == other._data;
+    }
+    template<typename Hasher>
+    void feed_hash(Hasher& h, const column_definition& def) const {
+        if (def.is_atomic()) {
+            ::feed_hash(h, as_atomic_cell(), def);
+        } else {
+            ::feed_hash(h, as_collection_mutation(), def);
+        }
+    }
+    size_t external_memory_usage() const {
+        return _data.external_memory_usage();
+    }
+    friend std::ostream& operator<<(std::ostream&, const atomic_cell_or_collection&);
 };
-
-namespace std {
-
-inline void swap(atomic_cell_or_collection& a, atomic_cell_or_collection& b) noexcept
-{
-    a.swap(b);
-}
-
-}

auth/allow_all_authenticator.hh

@@ -23,8 +23,8 @@
 
 #include <stdexcept>
 
-#include "auth/authenticated_user.hh"
 #include "auth/authenticator.hh"
+#include "auth/authenticated_user.hh"
 #include "auth/common.hh"
 
 namespace cql3 {
@@ -44,56 +44,52 @@ public:
     allow_all_authenticator(cql3::query_processor&, ::service::migration_manager&) {
     }
 
-    virtual future<> start() override {
+    future<> start() override {
         return make_ready_future<>();
     }
 
-    virtual future<> stop() override {
+    future<> stop() override {
         return make_ready_future<>();
     }
 
-    virtual const sstring& qualified_java_name() const override {
+    const sstring& qualified_java_name() const override {
         return allow_all_authenticator_name();
     }
 
-    virtual bool require_authentication() const override {
+    bool require_authentication() const override {
         return false;
     }
 
-    virtual authentication_option_set supported_options() const override {
-        return authentication_option_set();
+    option_set supported_options() const override {
+        return option_set();
     }
 
-    virtual authentication_option_set alterable_options() const override {
-        return authentication_option_set();
+    option_set alterable_options() const override {
+        return option_set();
     }
 
-    future<authenticated_user> authenticate(const credentials_map& credentials) const override {
-        return make_ready_future<authenticated_user>(anonymous_user());
+    future<::shared_ptr<authenticated_user>> authenticate(const credentials_map& credentials) const override {
+        return make_ready_future<::shared_ptr<authenticated_user>>(::make_shared<authenticated_user>());
     }
 
-    virtual future<> create(std::string_view, const authentication_options& options) const override {
+    future<> create(sstring username, const option_map& options) override {
         return make_ready_future();
     }
 
-    virtual future<> alter(std::string_view, const authentication_options& options) const override {
+    future<> alter(sstring username, const option_map& options) override {
         return make_ready_future();
     }
 
-    virtual future<> drop(std::string_view) const override {
+    future<> drop(sstring username) override {
         return make_ready_future();
     }
 
-    virtual future<custom_options> query_custom_options(std::string_view role_name) const override {
-        return make_ready_future<custom_options>();
+    const resource_ids& protected_resources() const override {
+        static const resource_ids ids;
+        return ids;
     }
 
-    virtual const resource_set& protected_resources() const override {
-        static const resource_set resources;
-        return resources;
-    }
-
-    virtual ::shared_ptr<sasl_challenge> new_sasl_challenge() const override {
+    ::shared_ptr<sasl_challenge> new_sasl_challenge() const override {
         throw std::runtime_error("Should not reach");
     }
 };

auth/allow_all_authorizer.hh

@@ -21,8 +21,9 @@
 
 #pragma once
 
-#include "auth/authorizer.hh"
+#include "authorizer.hh"
 #include "exceptions/exceptions.hh"
+#include "stdx.hh"
 
 namespace cql3 {
 class query_processor;
@@ -34,6 +35,8 @@ class migration_manager;
 
 namespace auth {
 
+class service;
+
 const sstring& allow_all_authorizer_name();
 
 class allow_all_authorizer final  : public authorizer {
@@ -41,51 +44,54 @@ public:
     allow_all_authorizer(cql3::query_processor&, ::service::migration_manager&) {
     }
 
-    virtual future<> start() override {
+    future<> start() override {
         return make_ready_future<>();
     }
 
-    virtual future<> stop() override {
+    future<> stop() override {
         return make_ready_future<>();
     }
 
-    virtual const sstring& qualified_java_name() const override {
+    const sstring& qualified_java_name() const override {
         return allow_all_authorizer_name();
     }
 
-    virtual future<permission_set> authorize(const role_or_anonymous&, const resource&) const override {
+    future<permission_set> authorize(service&, ::shared_ptr<authenticated_user>, data_resource) const override {
         return make_ready_future<permission_set>(permissions::ALL);
     }
 
-    virtual future<> grant(std::string_view, permission_set, const resource&) const override {
-        return make_exception_future<>(
-                unsupported_authorization_operation("GRANT operation is not supported by AllowAllAuthorizer"));
+    future<> grant(::shared_ptr<authenticated_user>, permission_set, data_resource, sstring) override {
+        throw exceptions::invalid_request_exception("GRANT operation is not supported by AllowAllAuthorizer");
     }
 
-    virtual future<> revoke(std::string_view, permission_set, const resource&) const override {
-        return make_exception_future<>(
-                unsupported_authorization_operation("REVOKE 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");
     }
 
-    virtual future<std::vector<permission_details>> list_all() const override {
-        return make_exception_future<std::vector<permission_details>>(
-                unsupported_authorization_operation(
-                        "LIST PERMISSIONS 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");
     }
 
-    virtual future<> revoke_all(std::string_view) const override {
-        return make_exception_future(
-                unsupported_authorization_operation("REVOKE operation is not supported by AllowAllAuthorizer"));
+    future<> revoke_all(sstring dropped_user) override {
+        return make_ready_future();
     }
 
-    virtual future<> revoke_all(const resource&) const override {
-        return make_exception_future(
-                unsupported_authorization_operation("REVOKE operation is not supported by AllowAllAuthorizer"));
+    future<> revoke_all(data_resource) override {
+        return make_ready_future();
     }
 
-    virtual const resource_set& protected_resources() const override {
-        static const resource_set resources;
-        return resources;
+    const resource_ids& protected_resources() override {
+        static const resource_ids ids;
+        return ids;
+    }
+
+    future<> validate_configuration() const override {
+        return make_ready_future();
     }
 };
 

auth/authenticated_user.cc

@@ -39,30 +39,26 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "auth/authenticated_user.hh"
 
-#include <iostream>
+#include "authenticated_user.hh"
 
-namespace auth {
+const sstring auth::authenticated_user::ANONYMOUS_USERNAME("anonymous");
 
-authenticated_user::authenticated_user(std::string_view name)
-        : name(sstring(name)) {
-}
-
-std::ostream& operator<<(std::ostream& os, const authenticated_user& u) {
-    if (!u.name) {
-        os << "anonymous";
-    } else {
-        os << *u.name;
-    }
-
-    return os;
-}
-
-static const authenticated_user the_anonymous_user{};
-
-const authenticated_user& anonymous_user() noexcept {
-    return the_anonymous_user;
+auth::authenticated_user::authenticated_user()
+                : _anon(true)
+{}
+
+auth::authenticated_user::authenticated_user(sstring name)
+                : _name(name), _anon(false)
+{}
+
+auth::authenticated_user::authenticated_user(authenticated_user&&) = default;
+auth::authenticated_user::authenticated_user(const authenticated_user&) = default;
+
+const sstring& auth::authenticated_user::name() const {
+    return _anon ? ANONYMOUS_USERNAME : _name;
 }
 
+bool auth::authenticated_user::operator==(const authenticated_user& v) const {
+    return _anon ? v._anon : _name == v._name;
 }

auth/authenticated_user.hh

@@ -41,62 +41,35 @@
 
 #pragma once
 
-#include <string_view>
-#include <functional>
-#include <iosfwd>
-#include <optional>
-
 #include <seastar/core/sstring.hh>
-
+#include <seastar/core/future.hh>
 #include "seastarx.hh"
 
 namespace auth {
 
-///
-/// A type-safe wrapper for the name of a logged-in user, or a nameless (anonymous) user.
-///
-class authenticated_user final {
+class authenticated_user {
 public:
-    ///
-    /// An anonymous user has no name.
-    ///
-    std::optional<sstring> name{};
+    static const sstring ANONYMOUS_USERNAME;
 
-    ///
-    /// An anonymous user.
-    ///
-    authenticated_user() = default;
-    explicit authenticated_user(std::string_view name);
-};
+    authenticated_user();
+    authenticated_user(sstring name);
+    authenticated_user(authenticated_user&&);
+    authenticated_user(const authenticated_user&);
 
-///
-/// The user name, or "anonymous".
-///
-std::ostream& operator<<(std::ostream&, const authenticated_user&);
+    const sstring& name() const;
 
-inline bool operator==(const authenticated_user& u1, const authenticated_user& u2) noexcept {
-    return u1.name == u2.name;
-}
-
-inline bool operator!=(const authenticated_user& u1, const authenticated_user& u2) noexcept {
-    return !(u1 == u2);
-}
-
-const authenticated_user& anonymous_user() noexcept;
-
-inline bool is_anonymous(const authenticated_user& u) noexcept {
-    return u == anonymous_user();
-}
-
-}
-
-namespace std {
-
-template <>
-struct hash<auth::authenticated_user> final {
-    size_t operator()(const auth::authenticated_user &u) const {
-        return std::hash<std::optional<sstring>>()(u.name);
+    /**
+     * If IAuthenticator doesn't require authentication, this method may return true.
+     */
+    bool is_anonymous() const {
+        return _anon;
     }
+
+    bool operator==(const authenticated_user&) const;
+private:
+    sstring _name;
+    bool _anon;
 };
 
 }
+

auth/authentication_options.cc

@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2018 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/authentication_options.hh"
-
-#include <iostream>
-
-namespace auth {
-
-std::ostream& operator<<(std::ostream& os, authentication_option a) {
-    switch (a) {
-        case authentication_option::password: os << "PASSWORD"; break;
-        case authentication_option::options: os << "OPTIONS"; break;
-    }
-
-    return os;
-}
-
-}

auth/authentication_options.hh

@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2018 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 <iosfwd>
-#include <optional>
-#include <stdexcept>
-#include <unordered_map>
-#include <unordered_set>
-
-#include <seastar/core/print.hh>
-#include <seastar/core/sstring.hh>
-
-#include "seastarx.hh"
-
-namespace auth {
-
-enum class authentication_option {
-    password,
-    options
-};
-
-std::ostream& operator<<(std::ostream&, authentication_option);
-
-using authentication_option_set = std::unordered_set<authentication_option>;
-
-using custom_options = std::unordered_map<sstring, sstring>;
-
-struct authentication_options final {
-    std::optional<sstring> password;
-    std::optional<custom_options> options;
-};
-
-inline bool any_authentication_options(const authentication_options& aos) noexcept {
-    return aos.password || aos.options;
-}
-
-class unsupported_authentication_option : public std::invalid_argument {
-public:
-    explicit unsupported_authentication_option(authentication_option k)
-            : std::invalid_argument(format("The {} option is not supported.", k)) {
-    }
-};
-
-}

auth/authenticator.cc

@@ -39,13 +39,29 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "auth/authenticator.hh"
-
-#include "auth/authenticated_user.hh"
-#include "auth/common.hh"
-#include "auth/password_authenticator.hh"
+#include "authenticator.hh"
+#include "authenticated_user.hh"
+#include "common.hh"
+#include "password_authenticator.hh"
 #include "cql3/query_processor.hh"
+#include "db/config.hh"
 #include "utils/class_registrator.hh"
 
 const sstring auth::authenticator::USERNAME_KEY("username");
 const sstring auth::authenticator::PASSWORD_KEY("password");
+
+auth::authenticator::option auth::authenticator::string_to_option(const sstring& name) {
+    if (strcasecmp(name.c_str(), "password") == 0) {
+        return option::PASSWORD;
+    }
+    throw std::invalid_argument(name);
+}
+
+sstring auth::authenticator::option_to_string(option opt) {
+    switch (opt) {
+    case option::PASSWORD:
+        return "PASSWORD";
+    default:
+        throw std::invalid_argument(sprint("Unknown option {}", opt));
+    }
+}

auth/authenticator.hh

@@ -41,22 +41,19 @@
 
 #pragma once
 
-#include <string_view>
 #include <memory>
+#include <unordered_map>
 #include <set>
 #include <stdexcept>
-#include <unordered_map>
-
 #include <boost/any.hpp>
-#include <seastar/core/enum.hh>
-#include <seastar/core/future.hh>
-#include <seastar/core/sstring.hh>
-#include <seastar/core/shared_ptr.hh>
 
-#include "auth/authentication_options.hh"
-#include "auth/resource.hh"
-#include "auth/sasl_challenge.hh"
+#include <seastar/core/sstring.hh>
+#include <seastar/core/future.hh>
+#include <seastar/core/shared_ptr.hh>
+#include <seastar/core/enum.hh>
+
 #include "bytes.hh"
+#include "data_resource.hh"
 #include "enum_set.hh"
 #include "exceptions/exceptions.hh"
 
@@ -68,90 +65,126 @@ namespace auth {
 
 class authenticated_user;
 
-///
-/// Abstract client for authenticating role identity.
-///
-/// All state necessary to authorize a role is stored externally to the client instance.
-///
 class authenticator {
 public:
-    ///
-    /// The name of the key to be used for the user-name part of password authentication with \ref authenticate.
-    ///
     static const sstring USERNAME_KEY;
-
-    ///
-    /// The name of the key to be used for the password part of password authentication with \ref authenticate.
-    ///
     static const sstring PASSWORD_KEY;
 
+    /**
+     * Supported CREATE USER/ALTER USER options.
+     * Currently only PASSWORD is available.
+     */
+    enum class option {
+        PASSWORD
+    };
+
+    static option string_to_option(const sstring&);
+    static sstring option_to_string(option);
+
+    using option_set = enum_set<super_enum<option, option::PASSWORD>>;
+    using option_map = std::unordered_map<option, boost::any, enum_hash<option>>;
     using credentials_map = std::unordered_map<sstring, sstring>;
 
-    virtual ~authenticator() = default;
+    virtual ~authenticator()
+    {}
 
     virtual future<> start() = 0;
 
     virtual future<> stop() = 0;
 
-    ///
-    /// A fully-qualified (class with package) Java-like name for this implementation.
-    ///
     virtual const sstring& qualified_java_name() const = 0;
 
+    /**
+     * Whether or not the authenticator requires explicit login.
+     * If false will instantiate user with AuthenticatedUser.ANONYMOUS_USER.
+     */
     virtual bool require_authentication() const = 0;
 
-    virtual authentication_option_set supported_options() const = 0;
+    /**
+     * Set of options supported by CREATE USER and ALTER USER queries.
+     * Should never return null - always return an empty set instead.
+     */
+    virtual option_set supported_options() const = 0;
 
-    ///
-    /// A subset of `supported_options()` that users are permitted to alter for themselves.
-    ///
-    virtual authentication_option_set alterable_options() const = 0;
+    /**
+     * Subset of supportedOptions that users are allowed to alter when performing ALTER USER [themselves].
+     * Should never return null - always return an empty set instead.
+     */
+    virtual option_set alterable_options() const = 0;
 
-    ///
-    /// Authenticate a user given implementation-specific credentials.
-    ///
-    /// If this implementation does not require authentication (\ref require_authentication), an anonymous user may
-    /// result.
-    ///
-    /// \returns an exceptional future with \ref exceptions::authentication_exception if given invalid credentials.
-    ///
-    virtual future<authenticated_user> authenticate(const credentials_map& credentials) const = 0;
+    /**
+     * Authenticates a user given a Map<String, String> of credentials.
+     * Should never return null - always throw AuthenticationException instead.
+     * Returning AuthenticatedUser.ANONYMOUS_USER is an option as well if authentication is not required.
+     *
+     * @throws authentication_exception if credentials don't match any known user.
+     */
+    virtual future<::shared_ptr<authenticated_user>> authenticate(const credentials_map& credentials) const = 0;
 
-    ///
-    /// Create an authentication record for a new user. This is required before the user can log-in.
-    ///
-    /// The options provided must be a subset of `supported_options()`.
-    ///
-    virtual future<> create(std::string_view role_name, const authentication_options& options) const = 0;
+    /**
+     * Called during execution of CREATE USER query (also may be called on startup, see seedSuperuserOptions method).
+     * If authenticator is static then the body of the method should be left blank, but don't throw an exception.
+     * options are guaranteed to be a subset of supportedOptions().
+     *
+     * @param username Username of the user to create.
+     * @param options Options the user will be created with.
+     * @throws exceptions::request_validation_exception
+     * @throws exceptions::request_execution_exception
+     */
+    virtual future<> create(sstring username, const option_map& options) = 0;
 
-    ///
-    /// Alter the authentication record of an existing user.
-    ///
-    /// The options provided must be a subset of `supported_options()`.
-    ///
-    /// Callers must ensure that the specification of `alterable_options()` is adhered to.
-    ///
-    virtual future<> alter(std::string_view role_name, const authentication_options& options) const = 0;
+    /**
+     * Called during execution of ALTER USER query.
+     * options are always guaranteed to be a subset of supportedOptions(). Furthermore, if the user performing the query
+     * is not a superuser and is altering himself, then options are guaranteed to be a subset of alterableOptions().
+     * Keep the body of the method blank if your implementation doesn't support any options.
+     *
+     * @param username Username of the user that will be altered.
+     * @param options Options to alter.
+     * @throws exceptions::request_validation_exception
+     * @throws exceptions::request_execution_exception
+     */
+    virtual future<> alter(sstring username, const option_map& options) = 0;
 
-    ///
-    /// Delete the authentication record for a user. This will disallow the user from logging in.
-    ///
-    virtual future<> drop(std::string_view role_name) const = 0;
 
-    ///
-    /// Query for custom options (those corresponding to \ref authentication_options::options).
-    ///
-    /// If no options are set the result is an empty container.
-    ///
-    virtual future<custom_options> query_custom_options(std::string_view role_name) const = 0;
+    /**
+     * Called during execution of DROP USER query.
+     *
+     * @param username Username of the user that will be dropped.
+     * @throws exceptions::request_validation_exception
+     * @throws exceptions::request_execution_exception
+     */
+    virtual future<> drop(sstring username) = 0;
 
-    ///
-    /// System resources used internally as part of the implementation. These are made inaccessible to users.
-    ///
-    virtual const resource_set& protected_resources() const = 0;
+     /**
+     * Set of resources that should be made inaccessible to users and only accessible internally.
+     *
+     * @return Keyspaces, column families that will be unmodifiable by users; other resources.
+     * @see resource_ids
+     */
+    virtual const resource_ids& protected_resources() const = 0;
 
+    class sasl_challenge {
+    public:
+        virtual ~sasl_challenge() {}
+        virtual bytes evaluate_response(bytes_view client_response) = 0;
+        virtual bool is_complete() const = 0;
+        virtual future<::shared_ptr<authenticated_user>> get_authenticated_user() const = 0;
+    };
+
+    /**
+     * Provide a sasl_challenge to be used by the CQL binary protocol server. If
+     * the configured authenticator requires authentication but does not implement this
+     * interface we refuse to start the binary protocol server as it will have no way
+     * of authenticating clients.
+     * @return sasl_challenge implementation
+     */
     virtual ::shared_ptr<sasl_challenge> new_sasl_challenge() const = 0;
 };
 
+inline std::ostream& operator<<(std::ostream& os, authenticator::option opt) {
+    return os << authenticator::option_to_string(opt);
+}
+
 }
 

auth/authorizer.cc

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

auth/authorizer.hh

@@ -41,115 +41,127 @@
 
 #pragma once
 
-#include <string_view>
-#include <functional>
-#include <optional>
-#include <stdexcept>
-#include <tuple>
 #include <vector>
+#include <tuple>
 
+#include <experimental/optional>
 #include <seastar/core/future.hh>
 #include <seastar/core/shared_ptr.hh>
 
-#include "auth/permission.hh"
-#include "auth/resource.hh"
+#include "permission.hh"
+#include "data_resource.hh"
+
 #include "seastarx.hh"
 
 namespace auth {
 
-class role_or_anonymous;
+class service;
+
+class authenticated_user;
 
 struct permission_details {
-    sstring role_name;
-    ::auth::resource resource;
+    sstring user;
+    data_resource resource;
     permission_set permissions;
+
+    bool operator<(const permission_details& v) const {
+        return std::tie(user, resource, permissions) < std::tie(v.user, v.resource, v.permissions);
+    }
 };
 
-inline bool operator==(const permission_details& pd1, const permission_details& pd2) {
-    return std::forward_as_tuple(pd1.role_name, pd1.resource, pd1.permissions.mask())
-            == std::forward_as_tuple(pd2.role_name, pd2.resource, pd2.permissions.mask());
-}
+using std::experimental::optional;
 
-inline bool operator!=(const permission_details& pd1, const permission_details& pd2) {
-    return !(pd1 == pd2);
-}
-
-inline bool operator<(const permission_details& pd1, const permission_details& pd2) {
-    return std::forward_as_tuple(pd1.role_name, pd1.resource, pd1.permissions)
-            < std::forward_as_tuple(pd2.role_name, pd2.resource, pd2.permissions);
-}
-
-class unsupported_authorization_operation : public std::invalid_argument {
-public:
-    using std::invalid_argument::invalid_argument;
-};
-
-///
-/// Abstract client for authorizing roles to access resources.
-///
-/// All state necessary to authorize a role is stored externally to the client instance.
-///
 class authorizer {
 public:
-    virtual ~authorizer() = default;
+    virtual ~authorizer() {}
 
     virtual future<> start() = 0;
 
     virtual future<> stop() = 0;
 
-    ///
-    /// A fully-qualified (class with package) Java-like name for this implementation.
-    ///
     virtual const sstring& qualified_java_name() const = 0;
 
-    ///
-    /// Query for the permissions granted directly to a role for a particular \ref resource (and not any of its
-    /// parents).
-    ///
-    /// The optional role name is empty when an anonymous user is authorized. Some implementations may still wish to
-    /// grant default permissions in this case.
-    ///
-    virtual future<permission_set> authorize(const role_or_anonymous&, const resource&) const = 0;
+    /**
+     * The primary Authorizer method. Returns a set of permissions of a user on a resource.
+     *
+     * @param user Authenticated user requesting authorization.
+     * @param resource Resource for which the authorization is being requested. @see DataResource.
+     * @return Set of permissions of the user on the resource. Should never return empty. Use permission.NONE instead.
+     */
+    virtual future<permission_set> authorize(service&, ::shared_ptr<authenticated_user>, data_resource) const = 0;
 
-    ///
-    /// Grant a set of permissions to a role for a particular \ref resource.
-    ///
-    /// \throws \ref unsupported_authorization_operation if granting permissions is not supported.
-    ///
-    virtual future<> grant(std::string_view role_name, permission_set, const resource&) const = 0;
+    /**
+     * Grants a set of permissions on a resource to a user.
+     * The opposite of revoke().
+     *
+     * @param performer User who grants the permissions.
+     * @param permissions Set of permissions to grant.
+     * @param to Grantee of the permissions.
+     * @param resource Resource on which to grant the permissions.
+     *
+     * @throws RequestValidationException
+     * @throws RequestExecutionException
+     */
+    virtual future<> grant(::shared_ptr<authenticated_user> performer, permission_set, data_resource, sstring to) = 0;
 
-    ///
-    /// Revoke a set of permissions from a role for a particular \ref resource.
-    ///
-    /// \throws \ref unsupported_authorization_operation if revoking permissions is not supported.
-    ///
-    virtual future<> revoke(std::string_view role_name, permission_set, const resource&) const = 0;
+    /**
+     * Revokes a set of permissions on a resource from a user.
+     * The opposite of grant().
+     *
+     * @param performer User who revokes the permissions.
+     * @param permissions Set of permissions to revoke.
+     * @param from Revokee of the permissions.
+     * @param resource Resource on which to revoke the permissions.
+     *
+     * @throws RequestValidationException
+     * @throws RequestExecutionException
+     */
+    virtual future<> revoke(::shared_ptr<authenticated_user> performer, permission_set, data_resource, sstring from) = 0;
 
-    ///
-    /// Query for all directly granted permissions.
-    ///
-    /// \throws \ref unsupported_authorization_operation if listing permissions is not supported.
-    ///
-    virtual future<std::vector<permission_details>> list_all() const = 0;
+    /**
+     * Returns a list of permissions on a resource of a user.
+     *
+     * @param performer User who wants to see the permissions.
+     * @param permissions Set of Permission values the user is interested in. The result should only include the matching ones.
+     * @param resource The resource on which permissions are requested. Can be null, in which case permissions on all resources
+     *                 should be returned.
+     * @param of The user whose permissions are requested. Can be null, in which case permissions of every user should be returned.
+     *
+     * @return All of the matching permission that the requesting user is authorized to know about.
+     *
+     * @throws RequestValidationException
+     * @throws RequestExecutionException
+     */
+    virtual future<std::vector<permission_details>> list(service&, ::shared_ptr<authenticated_user> performer, permission_set, optional<data_resource>, optional<sstring>) const = 0;
 
-    ///
-    /// Revoke all permissions granted directly to a particular role.
-    ///
-    /// \throws \ref unsupported_authorization_operation if revoking permissions is not supported.
-    ///
-    virtual future<> revoke_all(std::string_view role_name) const = 0;
+    /**
+     * This method is called before deleting a user with DROP USER query so that a new user with the same
+     * name wouldn't inherit permissions of the deleted user in the future.
+     *
+     * @param droppedUser The user to revoke all permissions from.
+     */
+    virtual future<> revoke_all(sstring dropped_user) = 0;
 
-    ///
-    /// Revoke all permissions granted to any role for a particular resource.
-    ///
-    /// \throws \ref unsupported_authorization_operation if revoking permissions is not supported.
-    ///
-    virtual future<> revoke_all(const resource&) const = 0;
+    /**
+     * This method is called after a resource is removed (i.e. keyspace or a table is dropped).
+     *
+     * @param droppedResource The resource to revoke all permissions on.
+     */
+    virtual future<> revoke_all(data_resource) = 0;
 
-    ///
-    /// System resources used internally as part of the implementation. These are made inaccessible to users.
-    ///
-    virtual const resource_set& protected_resources() const = 0;
+    /**
+     * Set of resources that should be made inaccessible to users and only accessible internally.
+     *
+     * @return Keyspaces, column families that will be unmodifiable by users; other resources.
+     */
+    virtual const resource_ids& protected_resources() = 0;
+
+    /**
+     * Validates configuration of IAuthorizer implementation (if configurable).
+     *
+     * @throws ConfigurationException when there is a configuration error.
+     */
+    virtual future<> validate_configuration() const = 0;
 };
 
 }

auth/common.cc

@@ -25,10 +25,8 @@
 
 #include "cql3/query_processor.hh"
 #include "cql3/statements/create_table_statement.hh"
-#include "database.hh"
 #include "schema_builder.hh"
 #include "service/migration_manager.hh"
-#include "timeout_config.hh"
 
 namespace auth {
 
@@ -41,33 +39,17 @@ const sstring AUTH_PACKAGE_NAME("org.apache.cassandra.auth.");
 
 }
 
-static logging::logger auth_log("auth");
-
-// Func must support being invoked more than once.
-future<> do_after_system_ready(seastar::abort_source& as, seastar::noncopyable_function<future<>()> func) {
-    struct empty_state { };
-    return delay_until_system_ready(as).then([&as, func = std::move(func)] () mutable {
-        return exponential_backoff_retry::do_until_value(1s, 1min, as, [func = std::move(func)] {
-            return func().then_wrapped([] (auto&& f) -> std::optional<empty_state> {
-                if (f.failed()) {
-                    auth_log.debug("Auth task failed with error, rescheduling: {}", f.get_exception());
-                    return { };
-                }
-                return { empty_state() };
-            });
-        });
-    }).discard_result();
-}
-
 future<> create_metadata_table_if_missing(
-        std::string_view table_name,
+        const sstring& table_name,
         cql3::query_processor& qp,
-        std::string_view cql,
+        const sstring& cql,
         ::service::migration_manager& mm) {
-    static auto ignore_existing = [] (seastar::noncopyable_function<future<>()> func) {
-        return futurize_apply(std::move(func)).handle_exception_type([] (exceptions::already_exists_exception& ignored) { });
-    };
-    auto& db = qp.db();
+    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));
 
@@ -76,36 +58,13 @@ future<> create_metadata_table_if_missing(
     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(qp.db());
+    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);
-    schema_ptr table = b.build();
-    return ignore_existing([&mm, table = std::move(table)] () {
-        return mm.announce_new_column_family(table, false);
-    });
 
-}
-
-future<> wait_for_schema_agreement(::service::migration_manager& mm, const database& db, seastar::abort_source& as) {
-    static const auto pause = [] { return sleep(std::chrono::milliseconds(500)); };
-
-    return do_until([&db, &as] {
-        as.check();
-        return db.get_version() != database::empty_version;
-    }, pause).then([&mm, &as] {
-        return do_until([&mm, &as] {
-            as.check();
-            return mm.have_schema_agreement();
-        }, pause);
-    });
-}
-
-const timeout_config& internal_distributed_timeout_config() noexcept {
-    static const auto t = 5s;
-    static const timeout_config tc{t, t, t, t, t, t, t};
-    return tc;
+    return mm.announce_new_column_family(b.build(), false);
 }
 
 }

auth/common.hh

@@ -22,23 +22,14 @@
 #pragma once
 
 #include <chrono>
-#include <string_view>
 
 #include <seastar/core/future.hh>
-#include <seastar/core/abort_source.hh>
-#include <seastar/util/noncopyable_function.hh>
 #include <seastar/core/reactor.hh>
 #include <seastar/core/resource.hh>
 #include <seastar/core/sstring.hh>
 
-#include "log.hh"
+#include "delayed_tasks.hh"
 #include "seastarx.hh"
-#include "utils/exponential_backoff_retry.hh"
-
-using namespace std::chrono_literals;
-
-class database;
-class timeout_config;
 
 namespace service {
 class migration_manager;
@@ -68,24 +59,16 @@ future<> once_among_shards(Task&& f) {
     return make_ready_future<>();
 }
 
-inline future<> delay_until_system_ready(seastar::abort_source& as) {
-    return sleep_abortable(15s, as);
+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));
 }
 
-// Func must support being invoked more than once.
-future<> do_after_system_ready(seastar::abort_source& as, seastar::noncopyable_function<future<>()> func);
-
 future<> create_metadata_table_if_missing(
-        std::string_view table_name,
+        const sstring& table_name,
         cql3::query_processor&,
-        std::string_view cql,
+        const sstring& cql,
         ::service::migration_manager&);
 
-future<> wait_for_schema_agreement(::service::migration_manager&, const database&, seastar::abort_source&);
-
-///
-/// Time-outs for internal, non-local CQL queries.
-///
-const timeout_config& internal_distributed_timeout_config() noexcept;
-
 }

auth/data_resource.cc

@@ -0,0 +1,171 @@
+/*
+ * 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 "data_resource.hh"
+
+#include <regex>
+#include "service/storage_proxy.hh"
+
+const sstring auth::data_resource::ROOT_NAME("data");
+
+auth::data_resource::data_resource(level l, const sstring& ks, const sstring& cf)
+    : _level(l), _ks(ks), _cf(cf)
+{
+}
+
+auth::data_resource::data_resource()
+    : data_resource(level::ROOT)
+{}
+
+auth::data_resource::data_resource(const sstring& ks)
+    : data_resource(level::KEYSPACE, ks)
+{}
+
+auth::data_resource::data_resource(const sstring& ks, const sstring& cf)
+    : data_resource(level::COLUMN_FAMILY, ks, cf)
+{}
+
+auth::data_resource::level auth::data_resource::get_level() const {
+    return _level;
+}
+
+auth::data_resource auth::data_resource::from_name(
+                const sstring& s) {
+
+    static std::regex slash_regex("/");
+
+    auto i = std::regex_token_iterator<sstring::const_iterator>(s.begin(),
+                    s.end(), slash_regex, -1);
+    auto e = std::regex_token_iterator<sstring::const_iterator>();
+    auto n = std::distance(i, e);
+
+    if (n > 3 || ROOT_NAME != sstring(*i++)) {
+        throw std::invalid_argument(sprint("%s is not a valid data resource name", s));
+    }
+
+    if (n == 1) {
+        return data_resource();
+    }
+    auto ks = *i++;
+    if (n == 2) {
+        return data_resource(ks.str());
+    }
+    auto cf = *i++;
+    return data_resource(ks.str(), cf.str());
+}
+
+sstring auth::data_resource::name() const {
+    switch (get_level()) {
+        case level::ROOT:
+            return ROOT_NAME;
+        case level::KEYSPACE:
+            return sprint("%s/%s", ROOT_NAME, _ks);
+        case level::COLUMN_FAMILY:
+        default:
+            return sprint("%s/%s/%s", ROOT_NAME, _ks, _cf);
+    }
+}
+
+auth::data_resource auth::data_resource::get_parent() const {
+    switch (get_level()) {
+    case level::KEYSPACE:
+        return data_resource();
+    case level::COLUMN_FAMILY:
+        return data_resource(_ks);
+    default:
+        throw std::invalid_argument("Root-level resource can't have a parent");
+    }
+}
+
+const sstring& auth::data_resource::keyspace() const {
+    if (is_root_level()) {
+        throw std::invalid_argument("ROOT data resource has no keyspace");
+    }
+    return _ks;
+}
+
+const sstring& auth::data_resource::column_family() const {
+    if (!is_column_family_level()) {
+        throw std::invalid_argument(sprint("%s data resource has no column family", name()));
+    }
+    return _cf;
+}
+
+bool auth::data_resource::has_parent() const {
+    return !is_root_level();
+}
+
+bool auth::data_resource::exists() const {
+    switch (get_level()) {
+        case level::ROOT:
+            return true;
+        case level::KEYSPACE:
+            return service::get_local_storage_proxy().get_db().local().has_keyspace(_ks);
+        case level::COLUMN_FAMILY:
+        default:
+            return service::get_local_storage_proxy().get_db().local().has_schema(_ks, _cf);
+    }
+}
+
+sstring auth::data_resource::to_string() const {
+    switch (get_level()) {
+        case level::ROOT:
+            return "<all keyspaces>";
+        case level::KEYSPACE:
+            return sprint("<keyspace %s>", _ks);
+        case level::COLUMN_FAMILY:
+        default:
+            return sprint("<table %s.%s>", _ks, _cf);
+    }
+}
+
+bool auth::data_resource::operator==(const data_resource& v) const {
+    return _ks == v._ks && _cf == v._cf;
+}
+
+bool auth::data_resource::operator<(const data_resource& v) const {
+    return _ks < v._ks ? true : (v._ks < _ks ? false : _cf < v._cf);
+}
+
+std::ostream& auth::operator<<(std::ostream& os, const data_resource& r) {
+    return os << r.to_string();
+}
+

auth/data_resource.hh

@@ -0,0 +1,159 @@
+/*
+ * 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 "utils/hash.hh"
+#include <iosfwd>
+#include <set>
+#include <seastar/core/sstring.hh>
+#include "seastarx.hh"
+
+namespace auth {
+
+class data_resource {
+private:
+    enum class level {
+        ROOT, KEYSPACE, COLUMN_FAMILY
+    };
+
+    static const sstring ROOT_NAME;
+
+    level _level;
+    sstring _ks;
+    sstring _cf;
+
+    data_resource(level, const sstring& ks = {}, const sstring& cf = {});
+
+    level get_level() const;
+public:
+    /**
+     * Creates a DataResource representing the root-level resource.
+     * @return the root-level resource.
+     */
+    data_resource();
+    /**
+     * Creates a DataResource representing a keyspace.
+     *
+     * @param keyspace Name of the keyspace.
+     */
+    data_resource(const sstring& ks);
+    /**
+     * Creates a DataResource instance representing a column family.
+     *
+     * @param keyspace Name of the keyspace.
+     * @param columnFamily Name of the column family.
+     */
+    data_resource(const sstring& ks, const sstring& cf);
+
+    /**
+     * Parses a data resource name into a DataResource instance.
+     *
+     * @param name Name of the data resource.
+     * @return DataResource instance matching the name.
+     */
+    static data_resource from_name(const sstring&);
+
+    /**
+     * @return Printable name of the resource.
+     */
+    sstring name() const;
+
+    /**
+     * @return Parent of the resource, if any. Throws IllegalStateException if it's the root-level resource.
+     */
+    data_resource get_parent() const;
+
+    bool is_root_level() const {
+        return get_level() == level::ROOT;
+    }
+
+    bool is_keyspace_level() const {
+        return get_level() == level::KEYSPACE;
+    }
+
+    bool is_column_family_level() const {
+        return get_level() == level::COLUMN_FAMILY;
+    }
+
+    /**
+     * @return keyspace of the resource.
+     * @throws std::invalid_argument if it's the root-level resource.
+     */
+    const sstring& keyspace() const;
+
+    /**
+     * @return column family of the resource.
+     * @throws std::invalid_argument if it's not a cf-level resource.
+     */
+    const sstring& column_family() const;
+
+    /**
+     * @return Whether or not the resource has a parent in the hierarchy.
+     */
+    bool has_parent() const;
+
+    /**
+     * @return Whether or not the resource exists in scylla.
+     */
+    bool exists() const;
+
+    sstring to_string() const;
+
+    bool operator==(const data_resource&) const;
+    bool operator<(const data_resource&) const;
+
+    size_t hash_value() const {
+        return utils::tuple_hash()(_ks, _cf);
+    }
+};
+
+/**
+ * Resource id mappings, i.e. keyspace and/or column families.
+ */
+using resource_ids = std::set<data_resource>;
+
+std::ostream& operator<<(std::ostream&, const data_resource&);
+
+}
+
+
+

auth/default_authorizer.cc

@@ -39,286 +39,198 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "auth/default_authorizer.hh"
-
-extern "C" {
-#include <crypt.h>
 #include <unistd.h>
-}
-
-#include <chrono>
+#include <crypt.h>
 #include <random>
+#include <chrono>
 
-#include <boost/algorithm/string/join.hpp>
-#include <boost/range.hpp>
 #include <seastar/core/reactor.hh>
 
-#include "auth/authenticated_user.hh"
-#include "auth/common.hh"
-#include "auth/permission.hh"
-#include "auth/role_or_anonymous.hh"
+#include "common.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"
-#include "database.hh"
 
-namespace auth {
-
-const sstring& default_authorizer_name() {
+const sstring& auth::default_authorizer_name() {
     static const sstring name = meta::AUTH_PACKAGE_NAME + "CassandraAuthorizer";
     return name;
 }
 
-static const sstring ROLE_NAME = "role";
+static const sstring USER_NAME = "username";
 static const sstring RESOURCE_NAME = "resource";
 static const sstring PERMISSIONS_NAME = "permissions";
-static const sstring PERMISSIONS_CF = "role_permissions";
+static const sstring PERMISSIONS_CF = "permissions";
 
 static logging::logger alogger("default_authorizer");
 
 // To ensure correct initialization order, we unfortunately need to use a string literal.
 static const class_registrator<
-        authorizer,
-        default_authorizer,
+        auth::authorizer,
+        auth::default_authorizer,
         cql3::query_processor&,
         ::service::migration_manager&> password_auth_reg("org.apache.cassandra.auth.CassandraAuthorizer");
 
-default_authorizer::default_authorizer(cql3::query_processor& qp, ::service::migration_manager& mm)
+auth::default_authorizer::default_authorizer(cql3::query_processor& qp, ::service::migration_manager& mm)
         : _qp(qp)
         , _migration_manager(mm) {
 }
 
-default_authorizer::~default_authorizer() {
+auth::default_authorizer::~default_authorizer() {
 }
 
-static const sstring legacy_table_name{"permissions"};
+future<> auth::default_authorizer::start() {
+    static const 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,
+                    PERMISSIONS_CF, USER_NAME, RESOURCE_NAME, PERMISSIONS_NAME,
+                    USER_NAME, RESOURCE_NAME, 90 * 24 * 60 * 60); // 3 months.
 
-bool default_authorizer::legacy_metadata_exists() const {
-    return _qp.db().has_schema(meta::AUTH_KS, legacy_table_name);
-}
-
-future<bool> default_authorizer::any_granted() const {
-    static const sstring query = format("SELECT * FROM {}.{} LIMIT 1", meta::AUTH_KS, PERMISSIONS_CF);
-
-    return _qp.process(
-            query,
-            db::consistency_level::LOCAL_ONE,
-            infinite_timeout_config,
-            {},
-            true).then([this](::shared_ptr<cql3::untyped_result_set> results) {
-        return !results->empty();
-    });
-}
-
-future<> default_authorizer::migrate_legacy_metadata() const {
-    alogger.info("Starting migration of legacy permissions metadata.");
-    static const sstring query = format("SELECT * FROM {}.{}", meta::AUTH_KS, legacy_table_name);
-
-    return _qp.process(
-            query,
-            db::consistency_level::LOCAL_ONE,
-            infinite_timeout_config).then([this](::shared_ptr<cql3::untyped_result_set> results) {
-        return do_for_each(*results, [this](const cql3::untyped_result_set_row& row) {
-            return do_with(
-                    row.get_as<sstring>("username"),
-                    parse_resource(row.get_as<sstring>(RESOURCE_NAME)),
-                    [this, &row](const auto& username, const auto& r) {
-                const permission_set perms = permissions::from_strings(row.get_set<sstring>(PERMISSIONS_NAME));
-                return grant(username, perms, r);
-            });
-        }).finally([results] {});
-    }).then([] {
-        alogger.info("Finished migrating legacy permissions metadata.");
-    }).handle_exception([](std::exception_ptr ep) {
-        alogger.error("Encountered an error during migration!");
-        std::rethrow_exception(ep);
-    });
-}
-
-future<> default_authorizer::start() {
-    static const 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,
-            PERMISSIONS_CF,
-            ROLE_NAME,
-            RESOURCE_NAME,
-            PERMISSIONS_NAME,
-            ROLE_NAME,
-            RESOURCE_NAME,
-            90 * 24 * 60 * 60); // 3 months.
-
-    return once_among_shards([this] {
-        return create_metadata_table_if_missing(
+    return auth::once_among_shards([this] {
+        return auth::create_metadata_table_if_missing(
                 PERMISSIONS_CF,
                 _qp,
                 create_table,
-                _migration_manager).then([this] {
-            _finished = do_after_system_ready(_as, [this] {
-                return async([this] {
-                    wait_for_schema_agreement(_migration_manager, _qp.db(), _as).get0();
+                _migration_manager);
+    });
+}
 
-                    if (legacy_metadata_exists()) {
-                        if (!any_granted().get0()) {
-                            migrate_legacy_metadata().get0();
-                            return;
-                        }
+future<> auth::default_authorizer::stop() {
+    return make_ready_future<>();
+}
 
-                        alogger.warn("Ignoring legacy permissions metadata since role permissions exist.");
-                    }
-                });
-            });
+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) {
+        if (is_super) {
+            return make_ready_future<permission_set>(permissions::ALL);
+        }
+
+        /**
+         * TOOD: could create actual data type for permission (translating string<->perm),
+         * but this seems overkill right now. We still must store strings so...
+         */
+        auto 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() })
+                        .then_wrapped([=](future<::shared_ptr<cql3::untyped_result_set>> f) {
+            try {
+                auto res = f.get0();
+
+                if (res->empty() || !res->one().has(PERMISSIONS_NAME)) {
+                    return make_ready_future<permission_set>(permissions::NONE);
+                }
+                return make_ready_future<permission_set>(permissions::from_strings(res->one().get_set<sstring>(PERMISSIONS_NAME)));
+            } catch (exceptions::request_execution_exception& e) {
+                alogger.warn("CassandraAuthorizer failed to authorize {} for {}", user->name(), resource);
+                return make_ready_future<permission_set>(permissions::NONE);
+            }
         });
     });
 }
 
-future<> default_authorizer::stop() {
-    _as.request_abort();
-    return _finished.handle_exception_type([](const sleep_aborted&) {}).handle_exception_type([](const abort_requested_exception&) {});
+#include <boost/range.hpp>
+
+future<> auth::default_authorizer::modify(
+                ::shared_ptr<authenticated_user> performer, permission_set set,
+                data_resource resource, sstring user, sstring op) {
+    // TODO: why does this not check super user?
+    auto query = sprint("UPDATE %s.%s SET %s = %s %s ? WHERE %s = ? AND %s = ?",
+                    meta::AUTH_KS, PERMISSIONS_CF, PERMISSIONS_NAME,
+                    PERMISSIONS_NAME, op, USER_NAME, RESOURCE_NAME);
+    return _qp.process(query, db::consistency_level::ONE, {
+                    permissions::to_strings(set), user, resource.name() }).discard_result();
 }
 
-future<permission_set>
-default_authorizer::authorize(const role_or_anonymous& maybe_role, const resource& r) const {
-    if (is_anonymous(maybe_role)) {
-        return make_ready_future<permission_set>(permissions::NONE);
-    }
 
-    static const sstring query = format("SELECT {} FROM {}.{} WHERE {} = ? AND {} = ?",
-            PERMISSIONS_NAME,
-            meta::AUTH_KS,
-            PERMISSIONS_CF,
-            ROLE_NAME,
-            RESOURCE_NAME);
+future<> auth::default_authorizer::grant(
+                ::shared_ptr<authenticated_user> performer, permission_set set,
+                data_resource resource, sstring to) {
+    return modify(std::move(performer), std::move(set), std::move(resource), std::move(to), "+");
+}
 
-    return _qp.process(
-            query,
-            db::consistency_level::LOCAL_ONE,
-            infinite_timeout_config,
-            {*maybe_role.name, r.name()}).then([](::shared_ptr<cql3::untyped_result_set> results) {
-        if (results->empty()) {
-            return permissions::NONE;
+future<> auth::default_authorizer::revoke(
+                ::shared_ptr<authenticated_user> performer, permission_set set,
+                data_resource resource, sstring from) {
+    return modify(std::move(performer), std::move(set), std::move(resource), std::move(from), "-");
+}
+
+future<std::vector<auth::permission_details>> auth::default_authorizer::list(
+                service& ser, ::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) {
+        if (!is_super && (!user || performer->name() != *user)) {
+            throw exceptions::unauthorized_exception(sprint("You are not authorized to view %s's permissions", user ? *user : "everyone"));
         }
 
-        return permissions::from_strings(results->one().get_set<sstring>(PERMISSIONS_NAME));
-    });
-}
+        auto query = sprint("SELECT %s, %s, %s FROM %s.%s", USER_NAME, RESOURCE_NAME, PERMISSIONS_NAME, meta::AUTH_KS, PERMISSIONS_CF);
 
-future<>
-default_authorizer::modify(
-        std::string_view role_name,
-        permission_set set,
-        const resource& resource,
-        std::string_view op) const {
-    return do_with(
-            format("UPDATE {}.{} SET {} = {} {} ? WHERE {} = ? AND {} = ?",
-                    meta::AUTH_KS,
-                    PERMISSIONS_CF,
-                    PERMISSIONS_NAME,
-                    PERMISSIONS_NAME,
-                    op,
-                    ROLE_NAME,
-                    RESOURCE_NAME),
-            [this, &role_name, set, &resource](const auto& query) {
-        return _qp.process(
-                query,
-                db::consistency_level::ONE,
-                internal_distributed_timeout_config(),
-                {permissions::to_strings(set), sstring(role_name), resource.name()}).discard_result();
-    });
-}
+        // Oh, look, it is a case where it does not pay off to have
+        // parameters to process in an initializer list.
+        future<::shared_ptr<cql3::untyped_result_set>> f = make_ready_future<::shared_ptr<cql3::untyped_result_set>>();
 
+        if (resource && user) {
+            query += sprint(" WHERE %s = ? AND %s = ?", USER_NAME, RESOURCE_NAME);
+            f = _qp.process(query, db::consistency_level::ONE, {*user, resource->name()});
+        } else if (resource) {
+            query += sprint(" WHERE %s = ? ALLOW FILTERING", RESOURCE_NAME);
+            f = _qp.process(query, db::consistency_level::ONE, {resource->name()});
+        } else if (user) {
+            query += sprint(" WHERE %s = ?", USER_NAME);
+            f = _qp.process(query, db::consistency_level::ONE, {*user});
+        } else {
+            f = _qp.process(query, db::consistency_level::ONE, {});
+        }
 
-future<> default_authorizer::grant(std::string_view role_name, permission_set set, const resource& resource) const {
-    return modify(role_name, std::move(set), resource, "+");
-}
+        return f.then([set](::shared_ptr<cql3::untyped_result_set> res) {
+            std::vector<permission_details> result;
 
-future<> default_authorizer::revoke(std::string_view role_name, permission_set set, const resource& resource) const {
-    return modify(role_name, std::move(set), resource, "-");
-}
+            for (auto& row : *res) {
+                if (row.has(PERMISSIONS_NAME)) {
+                    auto username = row.get_as<sstring>(USER_NAME);
+                    auto resource = data_resource::from_name(row.get_as<sstring>(RESOURCE_NAME));
+                    auto ps = permissions::from_strings(row.get_set<sstring>(PERMISSIONS_NAME));
+                    ps = permission_set::from_mask(ps.mask() & set.mask());
 
-future<std::vector<permission_details>> default_authorizer::list_all() const {
-    static const sstring query = format("SELECT {}, {}, {} FROM {}.{}",
-            ROLE_NAME,
-            RESOURCE_NAME,
-            PERMISSIONS_NAME,
-            meta::AUTH_KS,
-            PERMISSIONS_CF);
-
-    return _qp.process(
-            query,
-            db::consistency_level::ONE,
-            internal_distributed_timeout_config(),
-            {},
-            true).then([](::shared_ptr<cql3::untyped_result_set> results) {
-        std::vector<permission_details> all_details;
-
-        for (const auto& row : *results) {
-            if (row.has(PERMISSIONS_NAME)) {
-                auto role_name = row.get_as<sstring>(ROLE_NAME);
-                auto resource = parse_resource(row.get_as<sstring>(RESOURCE_NAME));
-                auto perms = permissions::from_strings(row.get_set<sstring>(PERMISSIONS_NAME));
-                all_details.push_back(permission_details{std::move(role_name), std::move(resource), std::move(perms)});
+                    result.emplace_back(permission_details {username, resource, ps});
+                }
             }
-        }
-
-        return all_details;
+            return make_ready_future<std::vector<permission_details>>(std::move(result));
+        });
     });
 }
 
-future<> default_authorizer::revoke_all(std::string_view role_name) const {
-    static const sstring query = format("DELETE FROM {}.{} WHERE {} = ?",
-            meta::AUTH_KS,
-            PERMISSIONS_CF,
-            ROLE_NAME);
-
-    return _qp.process(
-            query,
-            db::consistency_level::ONE,
-            internal_distributed_timeout_config(),
-            {sstring(role_name)}).discard_result().handle_exception([role_name](auto ep) {
-        try {
-            std::rethrow_exception(ep);
-        } catch (exceptions::request_execution_exception& e) {
-            alogger.warn("CassandraAuthorizer failed to revoke all permissions of {}: {}", role_name, e);
-        }
-    });
+future<> auth::default_authorizer::revoke_all(sstring dropped_user) {
+    auto query = sprint("DELETE FROM %s.%s WHERE %s = ?", meta::AUTH_KS,
+                    PERMISSIONS_CF, USER_NAME);
+    return _qp.process(query, db::consistency_level::ONE, { dropped_user }).discard_result().handle_exception(
+                    [dropped_user](auto ep) {
+                        try {
+                            std::rethrow_exception(ep);
+                        } catch (exceptions::request_execution_exception& e) {
+                            alogger.warn("CassandraAuthorizer failed to revoke all permissions of {}: {}", dropped_user, e);
+                        }
+                    });
 }
 
-future<> default_authorizer::revoke_all(const resource& resource) const {
-    static const sstring query = format("SELECT {} FROM {}.{} WHERE {} = ? ALLOW FILTERING",
-            ROLE_NAME,
-            meta::AUTH_KS,
-            PERMISSIONS_CF,
-            RESOURCE_NAME);
-
-    return _qp.process(
-            query,
-            db::consistency_level::LOCAL_ONE,
-            infinite_timeout_config,
-            {resource.name()}).then_wrapped([this, resource](future<::shared_ptr<cql3::untyped_result_set>> f) {
+future<> auth::default_authorizer::revoke_all(data_resource resource) {
+    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) {
         try {
             auto res = f.get0();
-            return parallel_for_each(
-                    res->begin(),
-                    res->end(),
-                    [this, res, resource](const cql3::untyped_result_set::row& r) {
-                static const sstring query = format("DELETE FROM {}.{} WHERE {} = ? AND {} = ?",
-                        meta::AUTH_KS,
-                        PERMISSIONS_CF,
-                        ROLE_NAME,
-                        RESOURCE_NAME);
-
-                return _qp.process(
-                        query,
-                        db::consistency_level::LOCAL_ONE,
-                        infinite_timeout_config,
-                        {r.get_as<sstring>(ROLE_NAME), resource.name()}).discard_result().handle_exception(
-                                [resource](auto ep) {
+            return parallel_for_each(res->begin(), res->end(), [this, 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() })
+                                .discard_result().handle_exception([resource](auto ep) {
                     try {
                         std::rethrow_exception(ep);
                     } catch (exceptions::request_execution_exception& e) {
@@ -334,9 +246,12 @@ future<> default_authorizer::revoke_all(const resource& resource) const {
     });
 }
 
-const resource_set& default_authorizer::protected_resources() const {
-    static const resource_set resources({ make_data_resource(meta::AUTH_KS, PERMISSIONS_CF) });
-    return resources;
+
+const auth::resource_ids& auth::default_authorizer::protected_resources() {
+    static const resource_ids ids({ data_resource(meta::AUTH_KS, PERMISSIONS_CF) });
+    return ids;
 }
 
+future<> auth::default_authorizer::validate_configuration() const {
+    return make_ready_future();
 }

auth/default_authorizer.hh

@@ -43,9 +43,7 @@
 
 #include <functional>
 
-#include <seastar/core/abort_source.hh>
-
-#include "auth/authorizer.hh"
+#include "authorizer.hh"
 #include "cql3/query_processor.hh"
 #include "service/migration_manager.hh"
 
@@ -58,45 +56,36 @@ class default_authorizer : public authorizer {
 
     ::service::migration_manager& _migration_manager;
 
-    abort_source _as{};
-
-    future<> _finished{make_ready_future<>()};
-
 public:
     default_authorizer(cql3::query_processor&, ::service::migration_manager&);
-
     ~default_authorizer();
 
-    virtual future<> start() override;
+    future<> start() override;
 
-    virtual future<> stop() override;
+    future<> stop() override;
 
-    virtual const sstring& qualified_java_name() const override {
+    const sstring& qualified_java_name() const override {
         return default_authorizer_name();
     }
 
-    virtual future<permission_set> authorize(const role_or_anonymous&, const resource&) const override;
+    future<permission_set> authorize(service&, ::shared_ptr<authenticated_user>, data_resource) const override;
 
-    virtual future<> grant(std::string_view, permission_set, const resource&) const override;
+    future<> grant(::shared_ptr<authenticated_user>, permission_set, data_resource, sstring) override;
 
-    virtual future<> revoke( std::string_view, permission_set, const resource&) const override;
+    future<> revoke(::shared_ptr<authenticated_user>, permission_set, data_resource, sstring) override;
 
-    virtual future<std::vector<permission_details>> list_all() const override;
+    future<std::vector<permission_details>> list(service&, ::shared_ptr<authenticated_user>, permission_set, optional<data_resource>, optional<sstring>) const override;
 
-    virtual future<> revoke_all(std::string_view) const override;
+    future<> revoke_all(sstring) override;
 
-    virtual future<> revoke_all(const resource&) const override;
+    future<> revoke_all(data_resource) override;
 
-    virtual const resource_set& protected_resources() const override;
+    const resource_ids& protected_resources() override;
+
+    future<> validate_configuration() const override;
 
 private:
-    bool legacy_metadata_exists() const;
-
-    future<bool> any_granted() const;
-
-    future<> migrate_legacy_metadata() const;
-
-    future<> modify(std::string_view, permission_set, const resource&, std::string_view) const;
+    future<> modify(::shared_ptr<authenticated_user>, permission_set, data_resource, sstring, sstring);
 };
 
 } /* namespace auth */

auth/password_authenticator.cc

@@ -39,184 +39,198 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "auth/password_authenticator.hh"
-
-#include <algorithm>
-#include <chrono>
+#include <unistd.h>
+#include <crypt.h>
 #include <random>
-#include <string_view>
-#include <optional>
+#include <chrono>
 
-#include <boost/algorithm/cxx11/all_of.hpp>
 #include <seastar/core/reactor.hh>
 
-#include "auth/authenticated_user.hh"
-#include "auth/common.hh"
-#include "auth/passwords.hh"
-#include "auth/roles-metadata.hh"
+#include "common.hh"
+#include "password_authenticator.hh"
+#include "authenticated_user.hh"
 #include "cql3/untyped_result_set.hh"
 #include "log.hh"
 #include "service/migration_manager.hh"
 #include "utils/class_registrator.hh"
-#include "database.hh"
 
-namespace auth {
-
-const sstring& password_authenticator_name() {
+const sstring& auth::password_authenticator_name() {
     static const sstring name = meta::AUTH_PACKAGE_NAME + "PasswordAuthenticator";
     return name;
 }
 
 // name of the hash column.
 static const sstring SALTED_HASH = "salted_hash";
-static const sstring DEFAULT_USER_NAME = meta::DEFAULT_SUPERUSER_NAME;
-static const sstring DEFAULT_USER_PASSWORD = meta::DEFAULT_SUPERUSER_NAME;
+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 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<
-        authenticator,
-        password_authenticator,
+        auth::authenticator,
+        auth::password_authenticator,
         cql3::query_processor&,
         ::service::migration_manager&> password_auth_reg("org.apache.cassandra.auth.PasswordAuthenticator");
 
-static thread_local auto rng_for_salt = std::default_random_engine(std::random_device{}());
+auth::password_authenticator::~password_authenticator()
+{}
 
-password_authenticator::~password_authenticator() {
-}
-
-password_authenticator::password_authenticator(cql3::query_processor& qp, ::service::migration_manager& mm)
+auth::password_authenticator::password_authenticator(cql3::query_processor& qp, ::service::migration_manager& mm)
     : _qp(qp)
-    , _migration_manager(mm)
-    , _stopped(make_ready_future<>()) {
+    , _migration_manager(mm) {
 }
 
-static bool has_salted_hash(const cql3::untyped_result_set_row& row) {
-    return !row.get_or<sstring>(SALTED_HASH, "").empty();
+// TODO: blowfish
+// Origin uses Java bcrypt library, i.e. blowfish salt
+// generation and hashing, which is arguably a "better"
+// password hash than sha/md5 versions usually available in
+// crypt_r. Otoh, glibc 2.7+ uses a modified sha512 algo
+// which should be the same order of safe, so the only
+// real issue should be salted hash compatibility with
+// origin if importing system tables from there.
+//
+// Since bcrypt/blowfish is _not_ (afaict) not available
+// as a dev package/lib on most linux distros, we'd have to
+// copy and compile for example OWL  crypto
+// (http://cvsweb.openwall.com/cgi/cvsweb.cgi/Owl/packages/glibc/crypt_blowfish/)
+// to be fully bit-compatible.
+//
+// Until we decide this is needed, let's just use crypt_r,
+// 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);
+    if (res == nullptr) {
+        throw std::system_error(errno, std::system_category());
+    }
+    return res;
 }
 
-static const sstring update_row_query = format("UPDATE {} SET {} = ? WHERE {} = ?",
-        meta::roles_table::qualified_name(),
-        SALTED_HASH,
-        meta::roles_table::role_col_name);
-
-static const sstring legacy_table_name{"credentials"};
-
-bool password_authenticator::legacy_metadata_exists() const {
-    return _qp.db().has_schema(meta::AUTH_KS, legacy_table_name);
+static bool checkpw(const sstring& pass, const sstring& salted_hash) {
+    auto tmp = hashpw(pass, salted_hash);
+    return tmp == salted_hash;
 }
 
-future<> password_authenticator::migrate_legacy_metadata() const {
-    plogger.info("Starting migration of legacy authentication metadata.");
-    static const sstring query = format("SELECT * FROM {}.{}", meta::AUTH_KS, legacy_table_name);
+static sstring gensalt() {
+    static sstring prefix;
 
-    return _qp.process(
-            query,
-            db::consistency_level::QUORUM,
-            internal_distributed_timeout_config()).then([this](::shared_ptr<cql3::untyped_result_set> results) {
-        return do_for_each(*results, [this](const cql3::untyped_result_set_row& row) {
-            auto username = row.get_as<sstring>("username");
-            auto salted_hash = row.get_as<sstring>(SALTED_HASH);
+    std::random_device rd;
+    std::default_random_engine e1(rd());
+    std::uniform_int_distribution<char> dist;
 
-            return _qp.process(
-                    update_row_query,
-                    consistency_for_user(username),
-                    internal_distributed_timeout_config(),
-                    {std::move(salted_hash), username}).discard_result();
-        }).finally([results] {});
-    }).then([] {
-       plogger.info("Finished migrating legacy authentication metadata.");
-    }).handle_exception([](std::exception_ptr ep) {
-        plogger.error("Encountered an error during migration!");
-        std::rethrow_exception(ep);
-    });
-}
+    sstring valid_salt = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./";
+    sstring input(rand_bytes, 0);
 
-future<> password_authenticator::create_default_if_missing() const {
-    return default_role_row_satisfies(_qp, &has_salted_hash).then([this](bool exists) {
-        if (!exists) {
-            return _qp.process(
-                    update_row_query,
-                    db::consistency_level::QUORUM,
-                    internal_distributed_timeout_config(),
-                    {passwords::hash(DEFAULT_USER_PASSWORD, rng_for_salt), DEFAULT_USER_NAME}).then([](auto&&) {
-                plogger.info("Created default superuser authentication record.");
-            });
+    for (char&c : input) {
+        c = valid_salt[dist(e1) % valid_salt.size()];
+    }
+
+    sstring salt;
+
+    if (!prefix.empty()) {
+        return prefix + input;
+    }
+
+    // Try in order:
+    // blowfish 2011 fix, blowfish, sha512, sha256, md5
+    for (sstring pfx : { "$2y$", "$2a$", "$6$", "$5$", "$1$" }) {
+        salt = pfx + input;
+        const char* e = crypt_r("fisk", salt.c_str(), &tlcrypt);
+
+        if (e && (e[0] != '*')) {
+            prefix = pfx;
+            return salt;
         }
+    }
+    throw std::runtime_error("Could not initialize hashing algorithm");
+}
 
-        return make_ready_future<>();
+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
+
+        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.
+
+        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<>();
+                });
+            });
+        });
     });
 }
 
-future<> password_authenticator::start() {
-     return once_among_shards([this] {
-         auto f = create_metadata_table_if_missing(
-                 meta::roles_table::name,
-                 _qp,
-                 meta::roles_table::creation_query(),
-                 _migration_manager);
-
-         _stopped = do_after_system_ready(_as, [this] {
-             return async([this] {
-                 wait_for_schema_agreement(_migration_manager, _qp.db(), _as).get0();
-
-                 if (any_nondefault_role_row_satisfies(_qp, &has_salted_hash).get0()) {
-                     if (legacy_metadata_exists()) {
-                         plogger.warn("Ignoring legacy authentication metadata since nondefault data already exist.");
-                     }
-
-                     return;
-                 }
-
-                 if (legacy_metadata_exists()) {
-                     migrate_legacy_metadata().get0();
-                     return;
-                 }
-
-                 create_default_if_missing().get0();
-             });
-         });
-
-         return f;
-     });
- }
-
-future<> password_authenticator::stop() {
-    _as.request_abort();
-    return _stopped.handle_exception_type([] (const sleep_aborted&) { }).handle_exception_type([](const abort_requested_exception&) {});
+future<> auth::password_authenticator::stop() {
+    return make_ready_future<>();
 }
 
-db::consistency_level password_authenticator::consistency_for_user(std::string_view role_name) {
-    if (role_name == DEFAULT_USER_NAME) {
+db::consistency_level auth::password_authenticator::consistency_for_user(const sstring& username) {
+    if (username == DEFAULT_USER_NAME) {
         return db::consistency_level::QUORUM;
     }
     return db::consistency_level::LOCAL_ONE;
 }
 
-const sstring& password_authenticator::qualified_java_name() const {
+const sstring& auth::password_authenticator::qualified_java_name() const {
     return password_authenticator_name();
 }
 
-bool password_authenticator::require_authentication() const {
+bool auth::password_authenticator::require_authentication() const {
     return true;
 }
 
-authentication_option_set password_authenticator::supported_options() const {
-    return authentication_option_set{authentication_option::password};
+auth::authenticator::option_set auth::password_authenticator::supported_options() const {
+    return option_set::of<option::PASSWORD>();
 }
 
-authentication_option_set password_authenticator::alterable_options() const {
-    return authentication_option_set{authentication_option::password};
+auth::authenticator::option_set auth::password_authenticator::alterable_options() const {
+    return option_set::of<option::PASSWORD>();
 }
 
-future<authenticated_user> password_authenticator::authenticate(
+future<::shared_ptr<auth::authenticated_user> > auth::password_authenticator::authenticate(
                 const credentials_map& credentials) const {
     if (!credentials.count(USERNAME_KEY)) {
-        throw exceptions::authentication_exception(format("Required key '{}' is missing", USERNAME_KEY));
+        throw exceptions::authentication_exception(sprint("Required key '%s' is missing", USERNAME_KEY));
     }
     if (!credentials.count(PASSWORD_KEY)) {
-        throw exceptions::authentication_exception(format("Required key '{}' is missing", PASSWORD_KEY));
+        throw exceptions::authentication_exception(sprint("Required key '%s' is missing", PASSWORD_KEY));
     }
 
     auto& username = credentials.at(USERNAME_KEY);
@@ -228,97 +242,177 @@ future<authenticated_user> password_authenticator::authenticate(
     // 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] {
-        static const sstring query = format("SELECT {} FROM {} WHERE {} = ?",
-                SALTED_HASH,
-                meta::roles_table::qualified_name(),
-                meta::roles_table::role_col_name);
-
-        return _qp.process(
-                query,
-                consistency_for_user(username),
-                internal_distributed_timeout_config(),
-                {username},
-                true);
+        return _qp.process(sprint("SELECT %s FROM %s.%s WHERE %s = ?", SALTED_HASH,
+                                        meta::AUTH_KS, CREDENTIALS_CF, USER_NAME),
+                        consistency_for_user(username), {username}, true);
     }).then_wrapped([=](future<::shared_ptr<cql3::untyped_result_set>> f) {
         try {
             auto res = f.get0();
-            auto salted_hash = std::optional<sstring>();
-            if (!res->empty()) {
-                salted_hash = res->one().get_opt<sstring>(SALTED_HASH);
-            }
-            if (!salted_hash || !passwords::check(password, *salted_hash)) {
+            if (res->empty() || !checkpw(password, res->one().get_as<sstring>(SALTED_HASH))) {
                 throw exceptions::authentication_exception("Username and/or password are incorrect");
             }
-            return make_ready_future<authenticated_user>(username);
+            return make_ready_future<::shared_ptr<authenticated_user>>(::make_shared<authenticated_user>(username));
         } catch (std::system_error &) {
             std::throw_with_nested(exceptions::authentication_exception("Could not verify password"));
         } catch (exceptions::request_execution_exception& e) {
             std::throw_with_nested(exceptions::authentication_exception(e.what()));
-        } catch (exceptions::authentication_exception& e) {
-            std::throw_with_nested(e);
         } catch (...) {
             std::throw_with_nested(exceptions::authentication_exception("authentication failed"));
         }
     });
 }
 
-future<> password_authenticator::create(std::string_view role_name, const authentication_options& options) const {
-    if (!options.password) {
-        return make_ready_future<>();
+future<> auth::password_authenticator::create(sstring username,
+                const option_map& options) {
+    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();
+    } catch (std::out_of_range&) {
+        throw exceptions::invalid_request_exception("PasswordAuthenticator requires PASSWORD option");
     }
-
-    return _qp.process(
-            update_row_query,
-            consistency_for_user(role_name),
-            internal_distributed_timeout_config(),
-            {passwords::hash(*options.password, rng_for_salt), sstring(role_name)}).discard_result();
 }
 
-future<> password_authenticator::alter(std::string_view role_name, const authentication_options& options) const {
-    if (!options.password) {
-        return make_ready_future<>();
+future<> auth::password_authenticator::alter(sstring username,
+                const option_map& options) {
+    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();
+    } catch (std::out_of_range&) {
+        throw exceptions::invalid_request_exception("PasswordAuthenticator requires PASSWORD option");
     }
+}
 
-    static const sstring query = format("UPDATE {} SET {} = ? WHERE {} = ?",
-            meta::roles_table::qualified_name(),
-            SALTED_HASH,
-            meta::roles_table::role_col_name);
+future<> auth::password_authenticator::drop(sstring username) {
+    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();
+    } 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) });
+    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)
+        {}
+
+        /**
+         * SASL PLAIN mechanism specifies that credentials are encoded in a
+         * sequence of UTF-8 bytes, delimited by 0 (US-ASCII NUL).
+         * The form is : {code}authzId<NUL>authnId<NUL>password<NUL>{code}
+         * authzId is optional, and in fact we don't care about it here as we'll
+         * set the authzId to match the authnId (that is, there is no concept of
+         * a user being authorized to act on behalf of another).
+         *
+         * @param bytes encoded credentials string sent by the client
+         * @return map containing the username/password pairs in the form an IAuthenticator
+         * would expect
+         * @throws javax.security.sasl.SaslException
+         */
+        bytes evaluate_response(bytes_view client_response) override {
+            plogger.debug("Decoding credentials from client token");
+
+            sstring username, password;
+
+            auto b = client_response.crbegin();
+            auto e = client_response.crend();
+            auto i = b;
+
+            while (i != e) {
+                if (*i == 0) {
+                    sstring tmp(i.base(), b.base());
+                    if (password.empty()) {
+                        password = std::move(tmp);
+                    } else if (username.empty()) {
+                        username = std::move(tmp);
+                    }
+                    b = ++i;
+                    continue;
+                }
+                ++i;
+            }
+
+            if (username.empty()) {
+                throw exceptions::authentication_exception("Authentication ID must not be null");
+            }
+            if (password.empty()) {
+                throw exceptions::authentication_exception("Password must not be null");
+            }
+
+            _credentials[USERNAME_KEY] = std::move(username);
+            _credentials[PASSWORD_KEY] = std::move(password);
+            _complete = true;
+            return {};
+        }
+        bool is_complete() const override {
+            return _complete;
+        }
+        future<::shared_ptr<authenticated_user>> get_authenticated_user() const override {
+            return _self.authenticate(_credentials);
+        }
+    private:
+        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(
-            query,
-            consistency_for_user(role_name),
-            internal_distributed_timeout_config(),
-            {passwords::hash(*options.password, rng_for_salt), sstring(role_name)}).discard_result();
-}
+            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);
+        }
 
-future<> password_authenticator::drop(std::string_view name) const {
-    static const sstring query = format("DELETE {} FROM {} WHERE {} = ?",
-            SALTED_HASH,
-            meta::roles_table::qualified_name(),
-            meta::roles_table::role_col_name);
+        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(
-            query, consistency_for_user(name),
-            internal_distributed_timeout_config(),
-            {sstring(name)}).discard_result();
-}
-
-future<custom_options> password_authenticator::query_custom_options(std::string_view role_name) const {
-    return make_ready_future<custom_options>();
-}
-
-const resource_set& password_authenticator::protected_resources() const {
-    static const resource_set resources({make_data_resource(meta::AUTH_KS, meta::roles_table::name)});
-    return resources;
-}
-
-::shared_ptr<sasl_challenge> password_authenticator::new_sasl_challenge() const {
-    return ::make_shared<plain_sasl_challenge>([this](std::string_view username, std::string_view password) {
-        credentials_map credentials{};
-        credentials[USERNAME_KEY] = sstring(username);
-        credentials[PASSWORD_KEY] = sstring(password);
-        return this->authenticate(credentials);
+            return _qp.process(
+                    all_users_query,
+                    db::consistency_level::QUORUM).then([](auto results) {
+                return make_ready_future<bool>(!results->empty());
+            });
+        });
     });
 }
-
-}

auth/password_authenticator.hh

@@ -41,10 +41,9 @@
 
 #pragma once
 
-#include <seastar/core/abort_source.hh>
-
-#include "auth/authenticator.hh"
+#include "authenticator.hh"
 #include "cql3/query_processor.hh"
+#include "delayed_tasks.hh"
 
 namespace service {
 class migration_manager;
@@ -56,49 +55,35 @@ const sstring& password_authenticator_name();
 
 class password_authenticator : public authenticator {
     cql3::query_processor& _qp;
+
     ::service::migration_manager& _migration_manager;
-    future<> _stopped;
-    seastar::abort_source _as;
+
+    delayed_tasks<> _delayed{};
 
 public:
-    static db::consistency_level consistency_for_user(std::string_view role_name);
-
     password_authenticator(cql3::query_processor&, ::service::migration_manager&);
-
     ~password_authenticator();
 
-    virtual future<> start() override;
+    future<> start() override;
 
-    virtual future<> stop() override;
+    future<> stop() override;
 
-    virtual const sstring& qualified_java_name() const override;
+    const sstring& qualified_java_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;
+    const resource_ids& protected_resources() const override;
+    ::shared_ptr<sasl_challenge> new_sasl_challenge() const override;
 
-    virtual bool require_authentication() const override;
 
-    virtual authentication_option_set supported_options() const override;
-
-    virtual authentication_option_set alterable_options() const override;
-
-    virtual future<authenticated_user> authenticate(const credentials_map& credentials) const override;
-
-    virtual future<> create(std::string_view role_name, const authentication_options& options) const override;
-
-    virtual future<> alter(std::string_view role_name, const authentication_options& options) const override;
-
-    virtual future<> drop(std::string_view role_name) const override;
-
-    virtual future<custom_options> query_custom_options(std::string_view role_name) const override;
-
-    virtual const resource_set& protected_resources() const override;
-
-    virtual ::shared_ptr<sasl_challenge> new_sasl_challenge() const override;
+    static db::consistency_level consistency_for_user(const sstring& username);
 
 private:
-    bool legacy_metadata_exists() const;
-
-    future<> migrate_legacy_metadata() const;
-
-    future<> create_default_if_missing() const;
+    future<bool> has_existing_users() const;
 };
 
 }

auth/passwords.cc

@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2018 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/passwords.hh"
-
-#include <cerrno>
-#include <optional>
-
-extern "C" {
-#include <crypt.h>
-#include <unistd.h>
-}
-
-namespace auth::passwords {
-
-static thread_local crypt_data tlcrypt = { 0, };
-
-namespace detail {
-
-scheme identify_best_supported_scheme() {
-    const auto all_schemes = { scheme::bcrypt_y, scheme::bcrypt_a, scheme::sha_512, scheme::sha_256, scheme::md5 };
-    // "Random", for testing schemes.
-    const sstring random_part_of_salt = "aaaabbbbccccdddd";
-
-    for (scheme c : all_schemes) {
-        const sstring salt = sstring(prefix_for_scheme(c)) + random_part_of_salt;
-        const char* e = crypt_r("fisk", salt.c_str(), &tlcrypt);
-
-        if (e && (e[0] != '*')) {
-            return c;
-        }
-    }
-
-    throw no_supported_schemes();
-}
-
-sstring hash_with_salt(const sstring& pass, const sstring& salt) {
-    auto res = crypt_r(pass.c_str(), salt.c_str(), &tlcrypt);
-    if (!res || (res[0] == '*')) {
-        throw std::system_error(errno, std::system_category());
-    }
-    return res;
-}
-
-const char* prefix_for_scheme(scheme c) noexcept {
-    switch (c) {
-    case scheme::bcrypt_y: return "$2y$";
-    case scheme::bcrypt_a: return "$2a$";
-    case scheme::sha_512: return "$6$";
-    case scheme::sha_256: return "$5$";
-    case scheme::md5: return "$1$";
-    default: return nullptr;
-    }
-}
-
-} // namespace detail
-
-no_supported_schemes::no_supported_schemes()
-        : std::runtime_error("No allowed hashing schemes are supported on this system") {
-}
-
-bool check(const sstring& pass, const sstring& salted_hash) {
-    return detail::hash_with_salt(pass, salted_hash) == salted_hash;
-}
-
-} // namespace auth::paswords

auth/passwords.hh

@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2018 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 <random>
-#include <stdexcept>
-
-#include <seastar/core/sstring.hh>
-
-#include "seastarx.hh"
-
-namespace auth::passwords {
-
-class no_supported_schemes : public std::runtime_error {
-public:
-    no_supported_schemes();
-};
-
-///
-/// Apache Cassandra uses a library to provide the bcrypt scheme. Many Linux implementations do not support bcrypt, so
-/// we support alternatives. The cost is loss of direct compatibility with Apache Cassandra system tables.
-///
-enum class scheme {
-    bcrypt_y,
-    bcrypt_a,
-    sha_512,
-    sha_256,
-    md5
-};
-
-namespace detail {
-
-template <typename RandomNumberEngine>
-sstring generate_random_salt_bytes(RandomNumberEngine& g) {
-    static const sstring valid_bytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./";
-    static constexpr std::size_t num_bytes = 16;
-    std::uniform_int_distribution<std::size_t> dist(0, valid_bytes.size() - 1);
-    sstring result(num_bytes, 0);
-
-    for (char& c : result) {
-        c = valid_bytes[dist(g)];
-    }
-
-    return result;
-}
-
-///
-/// Test each allowed hashing scheme and report the best supported one on the current system.
-///
-/// \throws \ref no_supported_schemes when none of the known schemes is supported.
-///
-scheme identify_best_supported_scheme();
-
-const char* prefix_for_scheme(scheme) noexcept;
-
-///
-/// Generate a implementation-specific salt string for hashing passwords.
-///
-/// The `RandomNumberEngine` is used to generate the string, which is an implementation-specific length.
-///
-/// \throws \ref no_supported_schemes when no known hashing schemes are supported on the system.
-///
-template <typename RandomNumberEngine>
-sstring generate_salt(RandomNumberEngine& g) {
-    static const scheme scheme = identify_best_supported_scheme();
-    static const sstring prefix = sstring(prefix_for_scheme(scheme));
-    return prefix + generate_random_salt_bytes(g);
-}
-
-///
-/// Hash a password combined with an implementation-specific salt string.
-///
-/// \throws \ref std::system_error when an unexpected implementation-specific error occurs.
-///
-sstring hash_with_salt(const sstring& pass, const sstring& salt);
-
-} // namespace detail
-
-///
-/// Run a one-way hashing function on cleartext to produce encrypted text.
-///
-/// Prior to applying the hashing function, random salt is amended to the cleartext. The random salt bytes are generated
-/// according to the random number engine `g`.
-///
-/// The result is the encrypted cyphertext, and also the salt used but in a implementation-specific format.
-///
-/// \throws \ref std::system_error when the implementation-specific implementation fails to hash the cleartext.
-///
-template <typename RandomNumberEngine>
-sstring hash(const sstring& pass, RandomNumberEngine& g) {
-    return detail::hash_with_salt(pass, detail::generate_salt(g));
-}
-
-///
-/// Check that cleartext matches previously hashed cleartext with salt.
-///
-/// \ref salted_hash is the result of invoking \ref hash, which is the implementation-specific combination of the hashed
-/// password and the salt that was generated for it.
-///
-/// \returns `true` if the cleartext matches the salted hash.
-///
-/// \throws \ref std::system_error when an unexpected implementation-specific error occurs.
-///
-bool check(const sstring& pass, const sstring& salted_hash);
-
-} // namespace auth::passwords

auth/permission.cc

@@ -39,33 +39,32 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "auth/permission.hh"
-
-#include <boost/algorithm/string.hpp>
-
 #include <unordered_map>
+#include <boost/algorithm/string.hpp>
+#include "permission.hh"
 
-const auth::permission_set auth::permissions::ALL = auth::permission_set::of<
-        auth::permission::CREATE,
-        auth::permission::ALTER,
-        auth::permission::DROP,
-        auth::permission::SELECT,
-        auth::permission::MODIFY,
-        auth::permission::AUTHORIZE,
-        auth::permission::DESCRIBE>();
-
+const auth::permission_set auth::permissions::ALL_DATA =
+                auth::permission_set::of<auth::permission::CREATE,
+                                auth::permission::ALTER, auth::permission::DROP,
+                                auth::permission::SELECT,
+                                auth::permission::MODIFY,
+                                auth::permission::AUTHORIZE>();
+const auth::permission_set auth::permissions::ALL = auth::permissions::ALL_DATA;
 const auth::permission_set auth::permissions::NONE;
+const auth::permission_set auth::permissions::ALTERATIONS =
+                auth::permission_set::of<auth::permission::CREATE,
+                                auth::permission::ALTER, auth::permission::DROP>();
 
 static const std::unordered_map<sstring, auth::permission> permission_names({
-        {"READ", auth::permission::READ},
-        {"WRITE", auth::permission::WRITE},
-        {"CREATE", auth::permission::CREATE},
-        {"ALTER", auth::permission::ALTER},
-        {"DROP", auth::permission::DROP},
-        {"SELECT", auth::permission::SELECT},
-        {"MODIFY", auth::permission::MODIFY},
-        {"AUTHORIZE", auth::permission::AUTHORIZE},
-        {"DESCRIBE", auth::permission::DESCRIBE}});
+    { "READ", auth::permission::READ },
+    { "WRITE", auth::permission::WRITE  },
+    { "CREATE", auth::permission::CREATE },
+    { "ALTER", auth::permission::ALTER },
+    { "DROP", auth::permission::DROP },
+    { "SELECT", auth::permission::SELECT  },
+    { "MODIFY", auth::permission::MODIFY   },
+    { "AUTHORIZE", auth::permission::AUTHORIZE },
+});
 
 const sstring& auth::permissions::to_string(permission p) {
     for (auto& v : permission_names) {

auth/permission.hh

@@ -42,11 +42,10 @@
 #pragma once
 
 #include <unordered_set>
-
 #include <seastar/core/sstring.hh>
 
-#include "enum_set.hh"
 #include "seastarx.hh"
+#include "enum_set.hh"
 
 namespace auth {
 
@@ -67,13 +66,9 @@ enum class permission {
 
     // permission management
     AUTHORIZE, // required for GRANT and REVOKE.
-    DESCRIBE, // required on the root-level role resource to list all roles.
-
 };
 
-typedef enum_set<
-        super_enum<
-                permission,
+typedef enum_set<super_enum<permission,
                 permission::READ,
                 permission::WRITE,
                 permission::CREATE,
@@ -81,15 +76,16 @@ typedef enum_set<
                 permission::DROP,
                 permission::SELECT,
                 permission::MODIFY,
-                permission::AUTHORIZE,
-                permission::DESCRIBE>> permission_set;
+                permission::AUTHORIZE>> permission_set;
 
 bool operator<(const permission_set&, const permission_set&);
 
 namespace permissions {
 
+extern const permission_set ALL_DATA;
 extern const permission_set ALL;
 extern const permission_set NONE;
+extern const permission_set ALTERATIONS;
 
 const sstring& to_string(permission);
 permission from_string(const sstring&);
@@ -97,6 +93,7 @@ permission from_string(const sstring&);
 std::unordered_set<sstring> to_strings(const permission_set&);
 permission_set from_strings(const std::unordered_set<sstring>&);
 
+
 }
 
 }

auth/permissions_cache.cc

@@ -24,20 +24,28 @@
 #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);
-              return ser.get_uncached_permissions(k.first, k.second);
+              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(const role_or_anonymous& maybe_role, const resource& r) {
-    return do_with(key_type(maybe_role, r), [this](const auto& k) {
-        return _cache.get(k);
-    });
+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

@@ -22,28 +22,37 @@
 #pragma once
 
 #include <chrono>
-#include <string_view>
 #include <functional>
 #include <iostream>
-#include <optional>
 #include <utility>
 
 #include <seastar/core/future.hh>
 #include <seastar/core/shared_ptr.hh>
-#include <seastar/core/sstring.hh>
 
 #include "auth/authenticated_user.hh"
+#include "auth/data_resource.hh"
 #include "auth/permission.hh"
-#include "auth/resource.hh"
-#include "auth/role_or_anonymous.hh"
 #include "log.hh"
-#include "utils/hash.hh"
 #include "utils/loading_cache.hh"
 
 namespace std {
 
-inline std::ostream& operator<<(std::ostream& os, const pair<auth::role_or_anonymous, auth::resource>& p) {
-    os << "{role: " << p.first << ", resource: " << p.second << "}";
+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;
 }
 
@@ -58,6 +67,8 @@ 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;
@@ -65,7 +76,7 @@ struct permissions_cache_config final {
 
 class permissions_cache final {
     using cache_type = utils::loading_cache<
-            std::pair<role_or_anonymous, resource>,
+            std::pair<authenticated_user, data_resource>,
             permission_set,
             utils::loading_cache_reload_enabled::yes,
             utils::simple_entry_size<permission_set>,
@@ -82,7 +93,7 @@ public:
         return _cache.stop();
     }
 
-    future<permission_set> get(const role_or_anonymous&, const resource&);
+    future<permission_set> get(::shared_ptr<authenticated_user>, data_resource);
 };
 
 }

auth/resource.cc

@@ -1,297 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Copyright (C) 2016 ScyllaDB
- *
- * Modified by ScyllaDB
- */
-
-/*
- * This file is part of Scylla.
- *
- * Scylla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Scylla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "auth/resource.hh"
-
-#include <algorithm>
-#include <iterator>
-#include <unordered_map>
-
-#include <boost/algorithm/string/join.hpp>
-#include <boost/algorithm/string/split.hpp>
-
-#include "service/storage_proxy.hh"
-
-namespace auth {
-
-std::ostream& operator<<(std::ostream& os, resource_kind kind) {
-    switch (kind) {
-        case resource_kind::data: os << "data"; break;
-        case resource_kind::role: os << "role"; break;
-    }
-
-    return os;
-}
-
-static const std::unordered_map<resource_kind, std::string_view> roots{
-        {resource_kind::data, "data"},
-        {resource_kind::role, "roles"}};
-
-static const std::unordered_map<resource_kind, std::size_t> max_parts{
-        {resource_kind::data, 2},
-        {resource_kind::role, 1}};
-
-static permission_set applicable_permissions(const data_resource_view& dv) {
-    if (dv.table()) {
-        return permission_set::of<
-                permission::ALTER,
-                permission::DROP,
-                permission::SELECT,
-                permission::MODIFY,
-                permission::AUTHORIZE>();
-    }
-
-    return permission_set::of<
-            permission::CREATE,
-            permission::ALTER,
-            permission::DROP,
-            permission::SELECT,
-            permission::MODIFY,
-            permission::AUTHORIZE>();
-}
-
-static permission_set applicable_permissions(const role_resource_view& rv) {
-    if (rv.role()) {
-        return permission_set::of<permission::ALTER, permission::DROP, permission::AUTHORIZE>();
-    }
-
-    return permission_set::of<
-            permission::CREATE,
-            permission::ALTER,
-            permission::DROP,
-            permission::AUTHORIZE,
-            permission::DESCRIBE>();
-}
-
-resource::resource(resource_kind kind) : _kind(kind) {
-    _parts.emplace_back(roots.at(kind));
-}
-
-resource::resource(resource_kind kind, utils::small_vector<sstring, 3> parts) : resource(kind) {
-    _parts.insert(_parts.end(), std::make_move_iterator(parts.begin()), std::make_move_iterator(parts.end()));
-}
-
-resource::resource(data_resource_t, std::string_view keyspace) : resource(resource_kind::data) {
-    _parts.emplace_back(keyspace);
-}
-
-resource::resource(data_resource_t, std::string_view keyspace, std::string_view table) : resource(resource_kind::data) {
-    _parts.emplace_back(keyspace);
-    _parts.emplace_back(table);
-}
-
-resource::resource(role_resource_t, std::string_view role) : resource(resource_kind::role) {
-    _parts.emplace_back(role);
-}
-
-sstring resource::name() const {
-    return boost::algorithm::join(_parts, "/");
-}
-
-std::optional<resource> resource::parent() const {
-    if (_parts.size() == 1) {
-        return {};
-    }
-
-    resource copy = *this;
-    copy._parts.pop_back();
-    return copy;
-}
-
-permission_set resource::applicable_permissions() const {
-    permission_set ps;
-
-    switch (_kind) {
-        case resource_kind::data: ps = ::auth::applicable_permissions(data_resource_view(*this)); break;
-        case resource_kind::role: ps = ::auth::applicable_permissions(role_resource_view(*this)); break;
-    }
-
-    return ps;
-}
-
-bool operator<(const resource& r1, const resource& r2) {
-    if (r1._kind != r2._kind) {
-        return r1._kind < r2._kind;
-    }
-
-    return std::lexicographical_compare(
-            r1._parts.cbegin() + 1,
-            r1._parts.cend(),
-            r2._parts.cbegin() + 1,
-            r2._parts.cend());
-}
-
-std::ostream& operator<<(std::ostream& os, const resource& r) {
-    switch (r.kind()) {
-        case resource_kind::data: return os << data_resource_view(r);
-        case resource_kind::role: return os << role_resource_view(r);
-    }
-
-    return os;
-}
-
-data_resource_view::data_resource_view(const resource& r) : _resource(r) {
-    if (r._kind != resource_kind::data) {
-        throw resource_kind_mismatch(resource_kind::data, r._kind);
-    }
-}
-
-std::optional<std::string_view> data_resource_view::keyspace() const {
-    if (_resource._parts.size() == 1) {
-        return {};
-    }
-
-    return _resource._parts[1];
-}
-
-std::optional<std::string_view> data_resource_view::table() const {
-    if (_resource._parts.size() <= 2) {
-        return {};
-    }
-
-    return _resource._parts[2];
-}
-
-std::ostream& operator<<(std::ostream& os, const data_resource_view& v) {
-    const auto keyspace = v.keyspace();
-    const auto table = v.table();
-
-    if (!keyspace) {
-        os << "<all keyspaces>";
-    } else if (!table) {
-        os << "<keyspace " << *keyspace << '>';
-    } else {
-        os << "<table " << *keyspace << '.' << *table << '>';
-    }
-
-    return os;
-}
-
-role_resource_view::role_resource_view(const resource& r) : _resource(r) {
-    if (r._kind != resource_kind::role) {
-        throw resource_kind_mismatch(resource_kind::role, r._kind);
-    }
-}
-
-std::optional<std::string_view> role_resource_view::role() const {
-    if (_resource._parts.size() == 1) {
-        return {};
-    }
-
-    return _resource._parts[1];
-}
-
-std::ostream& operator<<(std::ostream& os, const role_resource_view& v) {
-    const auto role = v.role();
-
-    if (!role) {
-        os << "<all roles>";
-    } else {
-        os << "<role " << *role << '>';
-    }
-
-    return os;
-}
-
-resource parse_resource(std::string_view name) {
-    static const std::unordered_map<std::string_view, resource_kind> reverse_roots = [] {
-        std::unordered_map<std::string_view, resource_kind> result;
-
-        for (const auto& pair : roots) {
-            result.emplace(pair.second, pair.first);
-        }
-
-        return result;
-    }();
-
-    utils::small_vector<sstring, 3> parts;
-    boost::split(parts, name, [](char ch) { return ch == '/'; });
-
-    if (parts.empty()) {
-        throw invalid_resource_name(name);
-    }
-
-    const auto iter = reverse_roots.find(parts[0]);
-    if (iter == reverse_roots.end()) {
-        throw invalid_resource_name(name);
-    }
-
-    const auto kind = iter->second;
-    parts.erase(parts.begin());
-
-    if (parts.size() > max_parts.at(kind)) {
-        throw invalid_resource_name(name);
-    }
-
-    return resource(kind, std::move(parts));
-}
-
-static const resource the_root_data_resource{resource_kind::data};
-
-const resource& root_data_resource() {
-    return the_root_data_resource;
-}
-
-static const resource the_root_role_resource{resource_kind::role};
-
-const resource& root_role_resource() {
-    return the_root_role_resource;
-}
-
-resource_set expand_resource_family(const resource& rr) {
-    resource r = rr;
-    resource_set rs;
-
-    while (true) {
-        const auto pr = r.parent();
-        rs.insert(std::move(r));
-
-        if (!pr) {
-            break;
-        }
-
-        r = std::move(*pr);
-    }
-
-    return rs;
-}
-
-}

auth/resource.hh

@@ -1,254 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * Copyright (C) 2016 ScyllaDB
- *
- * Modified by ScyllaDB
- */
-
-/*
- * This file is part of Scylla.
- *
- * Scylla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Scylla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <string_view>
-#include <iostream>
-#include <optional>
-#include <stdexcept>
-#include <tuple>
-#include <vector>
-#include <unordered_set>
-
-#include <seastar/core/print.hh>
-#include <seastar/core/sstring.hh>
-
-#include "auth/permission.hh"
-#include "seastarx.hh"
-#include "utils/hash.hh"
-#include "utils/small_vector.hh"
-
-namespace auth {
-
-class invalid_resource_name : public std::invalid_argument {
-public:
-    explicit invalid_resource_name(std::string_view name)
-            : std::invalid_argument(format("The resource name '{}' is invalid.", name)) {
-    }
-};
-
-enum class resource_kind {
-    data, role
-};
-
-std::ostream& operator<<(std::ostream&, resource_kind);
-
-///
-/// Type tag for constructing data resources.
-///
-struct data_resource_t final {};
-
-///
-/// Type tag for constructing role resources.
-///
-struct role_resource_t final {};
-
-///
-/// Resources are entities that users can be granted permissions on.
-///
-/// There are data (keyspaces and tables) and role resources. There may be other kinds of resources in the future.
-///
-/// When they are stored as system metadata, resources have the form `root/part_0/part_1/.../part_n`. Each kind of
-/// resource has a specific root prefix, followed by a maximum of `n` parts (where `n` is distinct for each kind of
-/// resource as well). In this code, this form is called the "name".
-///
-/// Since all resources have this same structure, all the different kinds are stored in instances of the same class:
-/// \ref resource. When we wish to query a resource for kind-specific data (like the table of a "data" resource), we
-/// create a kind-specific "view" of the resource.
-///
-class resource final {
-    resource_kind _kind;
-
-    utils::small_vector<sstring, 3> _parts;
-
-public:
-    ///
-    /// A root resource of a particular kind.
-    ///
-    explicit resource(resource_kind);
-    resource(data_resource_t, std::string_view keyspace);
-    resource(data_resource_t, std::string_view keyspace, std::string_view table);
-    resource(role_resource_t, std::string_view role);
-
-    resource_kind kind() const noexcept {
-        return _kind;
-    }
-
-    ///
-    /// A machine-friendly identifier unique to each resource.
-    ///
-    sstring name() const;
-
-    std::optional<resource> parent() const;
-
-    permission_set applicable_permissions() const;
-
-private:
-    resource(resource_kind, utils::small_vector<sstring, 3> parts);
-
-    friend class std::hash<resource>;
-    friend class data_resource_view;
-    friend class role_resource_view;
-
-    friend bool operator<(const resource&, const resource&);
-    friend bool operator==(const resource&, const resource&);
-    friend resource parse_resource(std::string_view);
-};
-
-bool operator<(const resource&, const resource&);
-
-inline bool operator==(const resource& r1, const resource& r2) {
-    return (r1._kind == r2._kind) && (r1._parts == r2._parts);
-}
-
-inline bool operator!=(const resource& r1, const resource& r2) {
-    return !(r1 == r2);
-}
-
-std::ostream& operator<<(std::ostream&, const resource&);
-
-class resource_kind_mismatch : public std::invalid_argument {
-public:
-    explicit resource_kind_mismatch(resource_kind expected, resource_kind actual)
-        : std::invalid_argument(
-            format("This resource has kind '{}', but was expected to have kind '{}'.", actual, expected)) {
-    }
-};
-
-/// A "data" view of \ref resource.
-///
-/// If neither `keyspace` nor `table` is present, this is the root resource.
-class data_resource_view final {
-    const resource& _resource;
-
-public:
-    ///
-    /// \throws `resource_kind_mismatch` if the argument is not a `data` resource.
-    ///
-    explicit data_resource_view(const resource& r);
-
-    std::optional<std::string_view> keyspace() const;
-
-    std::optional<std::string_view> table() const;
-};
-
-std::ostream& operator<<(std::ostream&, const data_resource_view&);
-
-///
-/// A "role" view of \ref resource.
-///
-/// If `role` is not present, this is the root resource.
-///
-class role_resource_view final {
-    const resource& _resource;
-
-public:
-    ///
-    /// \throws \ref resource_kind_mismatch if the argument is not a "role" resource.
-    ///
-    explicit role_resource_view(const resource&);
-
-    std::optional<std::string_view> role() const;
-};
-
-std::ostream& operator<<(std::ostream&, const role_resource_view&);
-
-///
-/// Parse a resource from its name.
-///
-/// \throws \ref invalid_resource_name when the name is malformed.
-///
-resource parse_resource(std::string_view name);
-
-const resource& root_data_resource();
-
-inline resource make_data_resource(std::string_view keyspace) {
-    return resource(data_resource_t{}, keyspace);
-}
-inline resource make_data_resource(std::string_view keyspace, std::string_view table) {
-    return resource(data_resource_t{}, keyspace, table);
-}
-
-const resource& root_role_resource();
-
-inline resource make_role_resource(std::string_view role) {
-    return resource(role_resource_t{}, role);
-}
-
-}
-
-namespace std {
-
-template <>
-struct hash<auth::resource> {
-    static size_t hash_data(const auth::data_resource_view& dv) {
-        return utils::tuple_hash()(std::make_tuple(auth::resource_kind::data, dv.keyspace(), dv.table()));
-    }
-
-    static size_t hash_role(const auth::role_resource_view& rv) {
-        return utils::tuple_hash()(std::make_tuple(auth::resource_kind::role, rv.role()));
-    }
-
-    size_t operator()(const auth::resource& r) const {
-        std::size_t value;
-
-        switch (r._kind) {
-        case auth::resource_kind::data: value = hash_data(auth::data_resource_view(r)); break;
-        case auth::resource_kind::role: value = hash_role(auth::role_resource_view(r)); break;
-        }
-
-        return value;
-    }
-};
-
-}
-
-namespace auth {
-
-using resource_set = std::unordered_set<resource>;
-
-//
-// A resource and all of its parents.
-//
-resource_set expand_resource_family(const resource&);
-
-}

auth/role_manager.hh

@@ -1,168 +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 <string_view>
-#include <memory>
-#include <optional>
-#include <stdexcept>
-#include <unordered_set>
-
-#include <seastar/core/future.hh>
-#include <seastar/core/print.hh>
-#include <seastar/core/sstring.hh>
-
-#include "auth/resource.hh"
-#include "seastarx.hh"
-
-namespace auth {
-
-struct role_config final {
-    bool is_superuser{false};
-    bool can_login{false};
-};
-
-///
-/// Differential update for altering existing roles.
-///
-struct role_config_update final {
-    std::optional<bool> is_superuser{};
-    std::optional<bool> can_login{};
-};
-
-///
-/// A logical argument error for a role-management operation.
-///
-class roles_argument_exception : public std::invalid_argument {
-public:
-    using std::invalid_argument::invalid_argument;
-};
-
-class role_already_exists : public roles_argument_exception {
-public:
-    explicit role_already_exists(std::string_view role_name)
-            : roles_argument_exception(format("Role {} already exists.", role_name)) {
-    }
-};
-
-class nonexistant_role : public roles_argument_exception {
-public:
-    explicit nonexistant_role(std::string_view role_name)
-            : roles_argument_exception(format("Role {} doesn't exist.", role_name)) {
-    }
-};
-
-class role_already_included : public roles_argument_exception {
-public:
-    role_already_included(std::string_view grantee_name, std::string_view role_name)
-            : roles_argument_exception(
-                      format("{} already includes role {}.", grantee_name, role_name)) {
-    }
-};
-
-class revoke_ungranted_role : public roles_argument_exception {
-public:
-    revoke_ungranted_role(std::string_view revokee_name, std::string_view role_name)
-            : roles_argument_exception(
-                      format("{} was not granted role {}, so it cannot be revoked.", revokee_name, role_name)) {
-    }
-};
-
-using role_set = std::unordered_set<sstring>;
-
-enum class recursive_role_query { yes, no };
-
-///
-/// Abstract client for managing roles.
-///
-/// All state necessary for managing roles is stored externally to the client instance.
-///
-/// All implementations should throw role-related exceptions as documented. Authorization is not addressed here, and
-/// access-control should never be enforced in implementations.
-///
-class role_manager {
-public:
-    virtual ~role_manager() = default;
-
-    virtual std::string_view qualified_java_name() const noexcept = 0;
-
-    virtual const resource_set& protected_resources() const = 0;
-
-    virtual future<> start() = 0;
-
-    virtual future<> stop() = 0;
-
-    ///
-    /// \returns an exceptional future with \ref role_already_exists for a role that has previously been created.
-    ///
-    virtual future<> create(std::string_view role_name, const role_config&) const = 0;
-
-    ///
-    /// \returns an exceptional future with \ref nonexistant_role if the role does not exist.
-    ///
-    virtual future<> drop(std::string_view role_name) const = 0;
-
-    ///
-    /// \returns an exceptional future with \ref nonexistant_role if the role does not exist.
-    ///
-    virtual future<> alter(std::string_view role_name, const role_config_update&) const = 0;
-
-    ///
-    /// Grant `role_name` to `grantee_name`.
-    ///
-    /// \returns an exceptional future with \ref nonexistant_role if either the role or the grantee do not exist.
-    ///
-    /// \returns an exceptional future with \ref role_already_included if granting the role would be redundant, or
-    /// create a cycle.
-    ///
-    virtual future<> grant(std::string_view grantee_name, std::string_view role_name) const = 0;
-
-    ///
-    /// Revoke `role_name` from `revokee_name`.
-    ///
-    /// \returns an exceptional future with \ref nonexistant_role if either the role or the revokee do not exist.
-    ///
-    /// \returns an exceptional future with \ref revoke_ungranted_role if the role was not granted.
-    ///
-    virtual future<> revoke(std::string_view revokee_name, std::string_view role_name) const = 0;
-
-    ///
-    /// \returns an exceptional future with \ref nonexistant_role if the role does not exist.
-    ///
-    virtual future<role_set> query_granted(std::string_view grantee, recursive_role_query) const = 0;
-
-    virtual future<role_set> query_all() const = 0;
-
-    virtual future<bool> exists(std::string_view role_name) const = 0;
-
-    ///
-    /// \returns an exceptional future with \ref nonexistant_role if the role does not exist.
-    ///
-    virtual future<bool> is_superuser(std::string_view role_name) const = 0;
-
-    ///
-    /// \returns an exceptional future with \ref nonexistant_role if the role does not exist.
-    ///
-    virtual future<bool> can_login(std::string_view role_name) const = 0;
-};
-
-}

auth/role_or_anonymous.cc

@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2018 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/role_or_anonymous.hh"
-
-#include <iostream>
-
-namespace auth {
-
-std::ostream& operator<<(std::ostream& os, const role_or_anonymous& mr) {
-    os << mr.name.value_or("<anonymous>");
-    return os;
-}
-
-bool operator==(const role_or_anonymous& mr1, const role_or_anonymous& mr2) noexcept {
-    return mr1.name == mr2.name;
-}
-
-bool is_anonymous(const role_or_anonymous& mr) noexcept {
-    return !mr.name.has_value();
-}
-
-}

auth/role_or_anonymous.hh

@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2018 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 <string_view>
-#include <functional>
-#include <iosfwd>
-#include <optional>
-
-#include <seastar/core/sstring.hh>
-
-#include "seastarx.hh"
-
-namespace auth {
-
-class role_or_anonymous final {
-public:
-    std::optional<sstring> name{};
-
-    role_or_anonymous() = default;
-    role_or_anonymous(std::string_view name) : name(name) {
-    }
-};
-
-std::ostream& operator<<(std::ostream&, const role_or_anonymous&);
-
-bool operator==(const role_or_anonymous&, const role_or_anonymous&) noexcept;
-
-inline bool operator!=(const role_or_anonymous& mr1, const role_or_anonymous& mr2) noexcept {
-    return !(mr1 == mr2);
-}
-
-bool is_anonymous(const role_or_anonymous&) noexcept;
-
-}
-
-namespace std {
-
-template <>
-struct hash<auth::role_or_anonymous> {
-    size_t operator()(const auth::role_or_anonymous& mr) const {
-        return hash<std::optional<sstring>>()(mr.name);
-    }
-};
-
-}

auth/roles-metadata.cc

@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2018 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/roles-metadata.hh"
-
-#include <boost/algorithm/cxx11/any_of.hpp>
-#include <seastar/core/print.hh>
-#include <seastar/core/shared_ptr.hh>
-#include <seastar/core/sstring.hh>
-
-#include "auth/common.hh"
-#include "cql3/query_processor.hh"
-#include "cql3/untyped_result_set.hh"
-
-namespace auth {
-
-namespace meta {
-
-namespace roles_table {
-
-std::string_view creation_query() {
-    static const sstring instance = sprint(
-            "CREATE TABLE %s ("
-            "  %s text PRIMARY KEY,"
-            "  can_login boolean,"
-            "  is_superuser boolean,"
-            "  member_of set<text>,"
-            "  salted_hash text"
-            ")",
-            qualified_name(),
-            role_col_name);
-
-    return instance;
-}
-
-std::string_view qualified_name() noexcept {
-    static const sstring instance = AUTH_KS + "." + sstring(name);
-    return instance;
-}
-
-}
-
-}
-
-future<bool> default_role_row_satisfies(
-        cql3::query_processor& qp,
-        std::function<bool(const cql3::untyped_result_set_row&)> p) {
-    static const sstring query = format("SELECT * FROM {} WHERE {} = ?",
-            meta::roles_table::qualified_name(),
-            meta::roles_table::role_col_name);
-
-    return do_with(std::move(p), [&qp](const auto& p) {
-        return qp.process(
-                query,
-                db::consistency_level::ONE,
-                infinite_timeout_config,
-                {meta::DEFAULT_SUPERUSER_NAME},
-                true).then([&qp, &p](::shared_ptr<cql3::untyped_result_set> results) {
-            if (results->empty()) {
-                return qp.process(
-                        query,
-                        db::consistency_level::QUORUM,
-                        internal_distributed_timeout_config(),
-                        {meta::DEFAULT_SUPERUSER_NAME},
-                        true).then([&p](::shared_ptr<cql3::untyped_result_set> results) {
-                    if (results->empty()) {
-                        return make_ready_future<bool>(false);
-                    }
-
-                    return make_ready_future<bool>(p(results->one()));
-                });
-            }
-
-            return make_ready_future<bool>(p(results->one()));
-        });
-    });
-}
-
-future<bool> any_nondefault_role_row_satisfies(
-        cql3::query_processor& qp,
-        std::function<bool(const cql3::untyped_result_set_row&)> p) {
-    static const sstring query = format("SELECT * FROM {}", meta::roles_table::qualified_name());
-
-    return do_with(std::move(p), [&qp](const auto& p) {
-        return qp.process(
-                query,
-                db::consistency_level::QUORUM,
-                internal_distributed_timeout_config()).then([&p](::shared_ptr<cql3::untyped_result_set> results) {
-            if (results->empty()) {
-                return false;
-            }
-
-            static const sstring col_name = sstring(meta::roles_table::role_col_name);
-
-            return boost::algorithm::any_of(*results, [&p](const cql3::untyped_result_set_row& row) {
-                const bool is_nondefault = row.get_as<sstring>(col_name) != meta::DEFAULT_SUPERUSER_NAME;
-                return is_nondefault && p(row);
-            });
-        });
-    });
-}
-
-}

auth/roles-metadata.hh

@@ -1,68 +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 <string_view>
-#include <functional>
-
-#include <seastar/core/future.hh>
-
-#include "seastarx.hh"
-
-namespace cql3 {
-class query_processor;
-class untyped_result_set_row;
-}
-
-namespace auth {
-
-namespace meta {
-
-namespace roles_table {
-
-std::string_view creation_query();
-
-constexpr std::string_view name{"roles", 5};
-
-std::string_view qualified_name() noexcept;
-
-constexpr std::string_view role_col_name{"role", 4};
-
-}
-
-}
-
-///
-/// Check that the default role satisfies a predicate, or `false` if the default role does not exist.
-///
-future<bool> default_role_row_satisfies(
-        cql3::query_processor&,
-        std::function<bool(const cql3::untyped_result_set_row&)>);
-
-///
-/// Check that any nondefault role satisfies a predicate. `false` if no nondefault roles exist.
-///
-future<bool> any_nondefault_role_row_satisfies(
-        cql3::query_processor&,
-        std::function<bool(const cql3::untyped_result_set_row&)>);
-
-}

auth/sasl_challenge.cc

@@ -1,102 +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) 2019 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 "auth/sasl_challenge.hh"
-
-#include "exceptions/exceptions.hh"
-
-namespace auth {
-
-/**
- * SASL PLAIN mechanism specifies that credentials are encoded in a
- * sequence of UTF-8 bytes, delimited by 0 (US-ASCII NUL).
- * The form is : {code}authzId<NUL>authnId<NUL>password<NUL>{code}
- * authzId is optional, and in fact we don't care about it here as we'll
- * set the authzId to match the authnId (that is, there is no concept of
- * a user being authorized to act on behalf of another).
- *
- * @param bytes encoded credentials string sent by the client
- * @return map containing the username/password pairs in the form an IAuthenticator
- * would expect
- * @throws javax.security.sasl.SaslException
- */
-bytes plain_sasl_challenge::evaluate_response(bytes_view client_response) {
-    sstring username, password;
-
-    auto b = client_response.crbegin();
-    auto e = client_response.crend();
-    auto i = b;
-
-    while (i != e) {
-        if (*i == 0) {
-            sstring tmp(i.base(), b.base());
-            if (password.empty()) {
-                password = std::move(tmp);
-            } else if (username.empty()) {
-                username = std::move(tmp);
-            }
-            b = ++i;
-            continue;
-        }
-        ++i;
-    }
-
-    if (username.empty()) {
-        throw exceptions::authentication_exception("Authentication ID must not be null");
-    }
-    if (password.empty()) {
-        throw exceptions::authentication_exception("Password must not be null");
-    }
-
-    _username = std::move(username);
-    _password = std::move(password);
-    return {};
-}
-
-bool plain_sasl_challenge::is_complete() const {
-    return _username && _password;
-}
-
-future<authenticated_user> plain_sasl_challenge::get_authenticated_user() const {
-    return _when_complete(*_username, *_password);
-}
-
-}

auth/sasl_challenge.hh

@@ -1,89 +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) 2019 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 <functional>
-#include <optional>
-#include <string_view>
-
-#include <seastar/core/future.hh>
-#include <seastar/core/sstring.hh>
-
-#include "auth/authenticated_user.hh"
-#include "bytes.hh"
-#include "seastarx.hh"
-
-namespace auth {
-
-///
-/// A stateful SASL challenge which supports many authentication schemes (depending on the implementation).
-///
-class sasl_challenge {
-public:
-    virtual ~sasl_challenge() = default;
-
-    virtual bytes evaluate_response(bytes_view client_response) = 0;
-
-    virtual bool is_complete() const = 0;
-
-    virtual future<authenticated_user> get_authenticated_user() const = 0;
-};
-
-class plain_sasl_challenge : public sasl_challenge {
-public:
-    using completion_callback = std::function<future<authenticated_user>(std::string_view, std::string_view)>;
-
-    explicit plain_sasl_challenge(completion_callback f) : _when_complete(std::move(f)) {
-    }
-
-    virtual bytes evaluate_response(bytes_view) override;
-
-    virtual bool is_complete() const override;
-
-    virtual future<authenticated_user> get_authenticated_user() const override;
-
-private:
-    std::optional<sstring> _username, _password;
-    completion_callback _when_complete;
-};
-
-}

auth/service.cc

@@ -21,27 +21,22 @@
 
 #include "auth/service.hh"
 
-#include <algorithm>
 #include <map>
 
 #include <seastar/core/future-util.hh>
-#include <seastar/core/sharded.hh>
 #include <seastar/core/shared_ptr.hh>
 
 #include "auth/allow_all_authenticator.hh"
 #include "auth/allow_all_authorizer.hh"
 #include "auth/common.hh"
-#include "auth/password_authenticator.hh"
-#include "auth/role_or_anonymous.hh"
-#include "auth/standard_role_manager.hh"
 #include "cql3/query_processor.hh"
 #include "cql3/untyped_result_set.hh"
-#include "db/consistency_level_type.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"
-#include "database.hh"
 
 namespace auth {
 
@@ -77,18 +72,11 @@ private:
     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::make_data_resource(ks_name)).handle_exception_type([](const unsupported_authorization_operation&) {
-            // Nothing.
-        });
+        _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::make_data_resource(
-                        ks_name, cf_name)).handle_exception_type([](const unsupported_authorization_operation&) {
-            // Nothing.
-        });
+        _authorizer.revoke_all(auth::data_resource(ks_name, cf_name));
     }
 
     void on_drop_user_type(const sstring& ks_name, const sstring& type_name) override {}
@@ -97,57 +85,80 @@ private:
     void on_drop_view(const sstring& ks_name, const sstring& view_name) override {}
 };
 
-static future<> validate_role_exists(const service& ser, std::string_view role_name) {
-    return ser.underlying_role_manager().exists(role_name).then([role_name](bool exists) {
-        if (!exists) {
-            throw nonexistant_role(role_name);
-        }
-    });
+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> z,
-        std::unique_ptr<authenticator> a,
-        std::unique_ptr<role_manager> r)
+        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(z))
-            , _authenticator(std::move(a))
-            , _role_manager(std::move(r))
+            , _authorizer(std::move(a))
+            , _authenticator(std::move(b))
             , _migration_listener(std::make_unique<auth_migration_listener>(*_authorizer)) {
-    // The password authenticator requires that the `standard_role_manager` is running so that the roles metadata table
-    // it manages is created and updated. This cross-module dependency is rather gross, but we have to maintain it for
-    // the sake of compatibility with Apache Cassandra and its choice of auth. schema.
-    if ((_authenticator->qualified_java_name() == password_authenticator_name())
-            && (_role_manager->qualified_java_name() != standard_role_manager_name())) {
-        throw incompatible_module_combination(
-                format("The {} authenticator must be loaded alongside the {} role-manager.",
-                        password_authenticator_name(),
-                        standard_role_manager_name()));
-    }
 }
 
 service::service(
-        permissions_cache_config c,
+        permissions_cache_config cache_config,
         cql3::query_processor& qp,
         ::service::migration_manager& mm,
         const service_config& sc)
             : service(
-                      std::move(c),
+                      std::move(cache_config),
                       qp,
                       mm,
                       create_object<authorizer>(sc.authorizer_java_name, qp, mm),
-                      create_object<authenticator>(sc.authenticator_java_name, qp, mm),
-                      create_object<role_manager>(sc.role_manager_java_name, qp, mm)) {
+                      create_object<authenticator>(sc.authenticator_java_name, qp, mm)) {
 }
 
-future<> service::create_keyspace_if_missing() const {
-    auto& db = _qp.db();
+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"}};
@@ -160,19 +171,73 @@ future<> service::create_keyspace_if_missing() const {
 
         // We use min_timestamp so that default keyspace metadata will loose with any manual adjustments.
         // See issue #2129.
-        return _migration_manager.announce_new_keyspace(ksm, api::min_timestamp, false);
+        f = _migration_manager.announce_new_keyspace(ksm, api::min_timestamp, false);
     }
 
-    return make_ready_future<>();
+    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] {
-        return create_keyspace_if_missing();
+        if (should_create_metadata()) {
+            return create_metadata_if_missing();
+        }
+
+        return make_ready_future<>();
     }).then([this] {
-        return _role_manager->start().then([this] {
-            return when_all_succeed(_authorizer->start(), _authenticator->start());
-        });
+        return when_all_succeed(_authorizer->start(), _authenticator->start());
     }).then([this] {
         _permissions_cache = std::make_unique<permissions_cache>(_permissions_cache_config, *this, log);
     }).then([this] {
@@ -184,26 +249,25 @@ future<> service::start() {
 }
 
 future<> service::stop() {
-    // Only one of the shards has the listener registered, but let's try to
-    // unregister on each one just to make sure.
-    _migration_manager.unregister_listener(_migration_listener.get());
-
-    return _permissions_cache->stop().then([this] {
-        return when_all_succeed(_role_manager->stop(), _authorizer->stop(), _authenticator->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_legacy_users() const {
-    if (!_qp.db().has_schema(meta::AUTH_KS, meta::USERS_CF)) {
-        return make_ready_future<bool>(false);
-    }
-
-    static const sstring default_user_query = format("SELECT * FROM {}.{} WHERE {} = ?",
+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 = format("SELECT * FROM {}.{} LIMIT 1",
+    static const sstring all_users_query = sprint(
+            "SELECT * FROM %s.%s LIMIT 1",
             meta::AUTH_KS,
             meta::USERS_CF);
 
@@ -213,8 +277,7 @@ future<bool> service::has_existing_legacy_users() const {
     return _qp.process(
             default_user_query,
             db::consistency_level::ONE,
-            infinite_timeout_config,
-            {meta::DEFAULT_SUPERUSER_NAME},
+            { meta::DEFAULT_SUPERUSER_NAME },
             true).then([this](auto results) {
         if (!results->empty()) {
             return make_ready_future<bool>(true);
@@ -223,8 +286,7 @@ future<bool> service::has_existing_legacy_users() const {
         return _qp.process(
                 default_user_query,
                 db::consistency_level::QUORUM,
-                infinite_timeout_config,
-                {meta::DEFAULT_SUPERUSER_NAME},
+                { meta::DEFAULT_SUPERUSER_NAME },
                 true).then([this](auto results) {
             if (!results->empty()) {
                 return make_ready_future<bool>(true);
@@ -232,342 +294,62 @@ future<bool> service::has_existing_legacy_users() const {
 
             return _qp.process(
                     all_users_query,
-                    db::consistency_level::QUORUM,
-                    infinite_timeout_config).then([](auto results) {
+                    db::consistency_level::QUORUM).then([](auto results) {
                 return make_ready_future<bool>(!results->empty());
             });
         });
     });
 }
 
-future<permission_set>
-service::get_uncached_permissions(const role_or_anonymous& maybe_role, const resource& r) const {
-    if (is_anonymous(maybe_role)) {
-        return _authorizer->authorize(maybe_role, r);
-    }
-
-    const std::string_view role_name = *maybe_role.name;
-
-    return has_superuser(role_name).then([this, role_name, &r](bool superuser) {
-        if (superuser) {
-            return make_ready_future<permission_set>(r.applicable_permissions());
-        }
-
-        //
-        // Aggregate the permissions from all granted roles.
-        //
-
-        return do_with(permission_set(), [this, role_name, &r](auto& all_perms) {
-            return get_roles(role_name).then([this, &r, &all_perms](role_set all_roles) {
-                return do_with(std::move(all_roles), [this, &r, &all_perms](const auto& all_roles) {
-                    return parallel_for_each(all_roles, [this, &r, &all_perms](std::string_view role_name) {
-                        return _authorizer->authorize(role_name, r).then([&all_perms](permission_set perms) {
-                            all_perms = permission_set::from_mask(all_perms.mask() | perms.mask());
-                        });
-                    });
-                });
-            }).then([&all_perms] {
-                return all_perms;
-            });
-        });
+future<bool> service::is_existing_user(const sstring& name) const {
+    return select_user(_qp, name).then([](auto results) {
+        return !results->empty();
     });
 }
 
-future<permission_set> service::get_permissions(const role_or_anonymous& maybe_role, const resource& r) const {
-    return _permissions_cache->get(maybe_role, r);
-}
-
-future<bool> service::has_superuser(std::string_view role_name) const {
-    return this->get_roles(std::move(role_name)).then([this](role_set roles) {
-        return do_with(std::move(roles), [this](const role_set& roles) {
-            return do_with(false, roles.begin(), [this, &roles](bool& any_super, auto& iter) {
-                return do_until(
-                        [&roles, &any_super, &iter] { return any_super || (iter == roles.end()); },
-                        [this, &any_super, &iter] {
-                    return _role_manager->is_superuser(*iter++).then([&any_super](bool super) {
-                        any_super = super;
-                    });
-                }).then([&any_super] {
-                    return any_super;
-                });
-            });
-        });
+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<role_set> service::get_roles(std::string_view role_name) const {
-    //
-    // We may wish to cache this information in the future (as Apache Cassandra does).
-    //
-
-    return _role_manager->query_granted(role_name, recursive_role_query::yes);
+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<bool> service::exists(const resource& r) const {
-    switch (r.kind()) {
-        case resource_kind::data: {
-            const auto& db = _qp.db();
+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();
+}
 
-            data_resource_view v(r);
-            const auto keyspace = v.keyspace();
-            const auto table = v.table();
-
-            if (table) {
-                return make_ready_future<bool>(db.has_schema(sstring(*keyspace), sstring(*table)));
-            }
-
-            if (keyspace) {
-                return make_ready_future<bool>(db.has_keyspace(sstring(*keyspace)));
-            }
-
-            return make_ready_future<bool>(true);
-        }
-
-        case resource_kind::role: {
-            role_resource_view v(r);
-            const auto role = v.role();
-
-            if (role) {
-                return _role_manager->exists(*role);
-            }
-
-            return make_ready_future<bool>(true);
-        }
-    }
-
-    return make_ready_future<bool>(false);
+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> has_superuser(const service& ser, const authenticated_user& u) {
-    if (is_anonymous(u)) {
+future<bool> is_super_user(const service& ser, const authenticated_user& u) {
+    if (u.is_anonymous()) {
         return make_ready_future<bool>(false);
     }
 
-    return ser.has_superuser(*u.name);
-}
-
-future<role_set> get_roles(const service& ser, const authenticated_user& u) {
-    if (is_anonymous(u)) {
-        return make_ready_future<role_set>();
-    }
-
-    return ser.get_roles(*u.name);
-}
-
-future<permission_set> get_permissions(const service& ser, const authenticated_user& u, const resource& r) {
-    return do_with(role_or_anonymous(), [&ser, &u, &r](auto& maybe_role) {
-        maybe_role.name = u.name;
-        return ser.get_permissions(maybe_role, r);
-    });
-}
-
-bool is_enforcing(const service& ser)  {
-    const bool enforcing_authorizer = ser.underlying_authorizer().qualified_java_name() != allow_all_authorizer_name();
-
-    const bool enforcing_authenticator = ser.underlying_authenticator().qualified_java_name()
-            != allow_all_authenticator_name();
-
-    return enforcing_authorizer || enforcing_authenticator;
-}
-
-bool is_protected(const service& ser, const resource& r) noexcept {
-    return ser.underlying_role_manager().protected_resources().count(r)
-            || ser.underlying_authenticator().protected_resources().count(r)
-            || ser.underlying_authorizer().protected_resources().count(r);
-}
-
-static void validate_authentication_options_are_supported(
-        const authentication_options& options,
-        const authentication_option_set& supported) {
-    const auto check = [&supported](authentication_option k) {
-        if (supported.count(k) == 0) {
-            throw unsupported_authentication_option(k);
-        }
-    };
-
-    if (options.password) {
-        check(authentication_option::password);
-    }
-
-    if (options.options) {
-        check(authentication_option::options);
-    }
-}
-
-
-future<> create_role(
-        const service& ser,
-        std::string_view name,
-        const role_config& config,
-        const authentication_options& options) {
-    return ser.underlying_role_manager().create(name, config).then([&ser, name, &options] {
-        if (!auth::any_authentication_options(options)) {
-            return make_ready_future<>();
-        }
-
-        return futurize_apply(
-                &validate_authentication_options_are_supported,
-                options,
-                ser.underlying_authenticator().supported_options()).then([&ser, name, &options] {
-            return ser.underlying_authenticator().create(name, options);
-        }).handle_exception([&ser, &name](std::exception_ptr ep) {
-            // Roll-back.
-            return ser.underlying_role_manager().drop(name).then([ep = std::move(ep)] {
-                std::rethrow_exception(ep);
-            });
-        });
-    });
-}
-
-future<> alter_role(
-        const service& ser,
-        std::string_view name,
-        const role_config_update& config_update,
-        const authentication_options& options) {
-    return ser.underlying_role_manager().alter(name, config_update).then([&ser, name, &options] {
-        if (!any_authentication_options(options)) {
-            return make_ready_future<>();
-        }
-
-        return futurize_apply(
-                &validate_authentication_options_are_supported,
-                options,
-                ser.underlying_authenticator().supported_options()).then([&ser, name, &options] {
-            return ser.underlying_authenticator().alter(name, options);
-        });
-    });
-}
-
-future<> drop_role(const service& ser, std::string_view name) {
-    return do_with(make_role_resource(name), [&ser, name](const resource& r) {
-        auto& a = ser.underlying_authorizer();
-
-        return when_all_succeed(
-                a.revoke_all(name),
-                a.revoke_all(r)).handle_exception_type([](const unsupported_authorization_operation&) {
-            // Nothing.
-        });
-    }).then([&ser, name] {
-        return ser.underlying_authenticator().drop(name);
-    }).then([&ser, name] {
-        return ser.underlying_role_manager().drop(name);
-    });
-}
-
-future<bool> has_role(const service& ser, std::string_view grantee, std::string_view name) {
-    return when_all_succeed(
-            validate_role_exists(ser, name),
-            ser.get_roles(grantee)).then([name](role_set all_roles) {
-        return make_ready_future<bool>(all_roles.count(sstring(name)) != 0);
-    });
-}
-future<bool> has_role(const service& ser, const authenticated_user& u, std::string_view name) {
-    if (is_anonymous(u)) {
-        return make_ready_future<bool>(false);
-    }
-
-    return has_role(ser, *u.name, name);
-}
-
-future<> grant_permissions(
-        const service& ser,
-        std::string_view role_name,
-        permission_set perms,
-        const resource& r) {
-    return validate_role_exists(ser, role_name).then([&ser, role_name, perms, &r] {
-        return ser.underlying_authorizer().grant(role_name, perms, r);
-    });
-}
-
-future<> grant_applicable_permissions(const service& ser, std::string_view role_name, const resource& r) {
-    return grant_permissions(ser, role_name, r.applicable_permissions(), r);
-}
-future<> grant_applicable_permissions(const service& ser, const authenticated_user& u, const resource& r) {
-    if (is_anonymous(u)) {
-        return make_ready_future<>();
-    }
-
-    return grant_applicable_permissions(ser, *u.name, r);
-}
-
-future<> revoke_permissions(
-        const service& ser,
-        std::string_view role_name,
-        permission_set perms,
-        const resource& r) {
-    return validate_role_exists(ser, role_name).then([&ser, role_name, perms, &r] {
-        return ser.underlying_authorizer().revoke(role_name, perms, r);
-    });
-}
-
-future<std::vector<permission_details>> list_filtered_permissions(
-        const service& ser,
-        permission_set perms,
-        std::optional<std::string_view> role_name,
-        const std::optional<std::pair<resource, recursive_permissions>>& resource_filter) {
-    return ser.underlying_authorizer().list_all().then([&ser, perms, role_name, &resource_filter](
-            std::vector<permission_details> all_details) {
-
-        if (resource_filter) {
-            const resource r = resource_filter->first;
-
-            const auto resources = resource_filter->second
-                    ? auth::expand_resource_family(r)
-                    : auth::resource_set{r};
-
-            all_details.erase(
-                    std::remove_if(
-                            all_details.begin(),
-                            all_details.end(),
-                            [&resources](const permission_details& pd) {
-                        return resources.count(pd.resource) == 0;
-                    }),
-                    all_details.end());
-        }
-
-        std::transform(
-                std::make_move_iterator(all_details.begin()),
-                std::make_move_iterator(all_details.end()),
-                all_details.begin(),
-                [perms](permission_details pd) {
-                    pd.permissions = permission_set::from_mask(pd.permissions.mask() & perms.mask());
-                    return pd;
-                });
-
-        // Eliminate rows with an empty permission set.
-        all_details.erase(
-                std::remove_if(all_details.begin(), all_details.end(), [](const permission_details& pd) {
-                    return pd.permissions.mask() == 0;
-                }),
-                all_details.end());
-
-        if (!role_name) {
-            return make_ready_future<std::vector<permission_details>>(std::move(all_details));
-        }
-
-        //
-        // Filter out rows based on whether permissions have been granted to this role (directly or indirectly).
-        //
-
-        return do_with(std::move(all_details), [&ser, role_name](auto& all_details) {
-            return ser.get_roles(*role_name).then([&all_details](role_set all_roles) {
-                all_details.erase(
-                        std::remove_if(
-                                all_details.begin(),
-                                all_details.end(),
-                                [&all_roles](const permission_details& pd) {
-                            return all_roles.count(pd.role_name) == 0;
-                        }),
-                        all_details.end());
-
-                return make_ready_future<std::vector<permission_details>>(std::move(all_details));
-            });
-        });
-    });
+    return ser.is_super_user(u.name());
 }
 
 }

auth/service.hh

@@ -21,25 +21,27 @@
 
 #pragma once
 
-#include <string_view>
 #include <memory>
-#include <optional>
 
 #include <seastar/core/future.hh>
 #include <seastar/core/sstring.hh>
-#include <seastar/util/bool_class.hh>
 
 #include "auth/authenticator.hh"
 #include "auth/authorizer.hh"
+#include "auth/authenticated_user.hh"
 #include "auth/permission.hh"
 #include "auth/permissions_cache.hh"
-#include "auth/role_manager.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;
@@ -47,35 +49,16 @@ class migration_listener;
 
 namespace auth {
 
-class role_or_anonymous;
+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;
-    sstring role_manager_java_name;
 };
 
-///
-/// Due to poor (in this author's opinion) decisions of Apache Cassandra, certain choices of one role-manager,
-/// authenticator, or authorizer imply restrictions on the rest.
-///
-/// This exception is thrown when an invalid combination of modules is selected, with a message explaining the
-/// incompatibility.
-///
-class incompatible_module_combination : public std::invalid_argument {
-public:
-    using std::invalid_argument::invalid_argument;
-};
-
-///
-/// Client for access-control in the system.
-///
-/// Access control encompasses user/role management, authentication, and authorization. This client provides access to
-/// the dynamically-loaded implementations of these modules (through the `underlying_*` member functions), but also
-/// builds on their functionality with caching and abstractions for common operations.
-///
-/// All state associated with access-control is stored externally to any particular instance of this class.
-///
 class service final {
     permissions_cache_config _permissions_cache_config;
     std::unique_ptr<permissions_cache> _permissions_cache;
@@ -88,25 +71,19 @@ class service final {
 
     std::unique_ptr<authenticator> _authenticator;
 
-    std::unique_ptr<role_manager> _role_manager;
-
     // 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>,
-            std::unique_ptr<role_manager>);
+            std::unique_ptr<authenticator>);
 
-    ///
-    /// This constructor is intended to be used when the class is sharded via \ref seastar::sharded. In that case, the
-    /// arguments must be copyable, which is why we delay construction with instance-construction instructions instead
-    /// of the instances themselves.
-    ///
     service(
             permissions_cache_config,
             cql3::query_processor&,
@@ -117,173 +94,40 @@ public:
 
     future<> stop();
 
-    ///
-    /// \returns an exceptional future with \ref nonexistant_role if the named role does not exist.
-    ///
-    future<permission_set> get_permissions(const role_or_anonymous&, const resource&) const;
+    future<bool> is_existing_user(const sstring& name) const;
 
-    ///
-    /// Like \ref get_permissions, but never returns cached permissions.
-    ///
-    future<permission_set> get_uncached_permissions(const role_or_anonymous&, const resource&) const;
+    future<bool> is_super_user(const sstring& name) const;
 
-    ///
-    /// Query whether the named role has been granted a role that is a superuser.
-    ///
-    /// A role is always granted to itself. Therefore, a role that "is" a superuser also "has" superuser.
-    ///
-    /// \returns an exceptional future with \ref nonexistant_role if the role does not exist.
-    ///
-    future<bool> has_superuser(std::string_view role_name) const;
+    future<> insert_user(const sstring& name, bool is_superuser);
 
-    ///
-    /// Return the set of all roles granted to the given role, including itself and roles granted through other roles.
-    ///
-    /// \returns an exceptional future with \ref nonexistent_role if the role does not exist.
-    future<role_set> get_roles(std::string_view role_name) const;
+    future<> delete_user(const sstring& name);
 
-    future<bool> exists(const resource&) const;
+    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;
     }
 
-    const role_manager& underlying_role_manager() const {
-        return *_role_manager;
-    }
-
 private:
-    future<bool> has_existing_legacy_users() const;
+    future<bool> has_existing_users() const;
 
-    future<> create_keyspace_if_missing() const;
+    bool should_create_metadata() const;
+
+    future<> create_metadata_if_missing();
 };
 
-future<bool> has_superuser(const service&, const authenticated_user&);
-
-future<role_set> get_roles(const service&, const authenticated_user&);
-
-future<permission_set> get_permissions(const service&, const authenticated_user&, const resource&);
-
-///
-/// Access-control is "enforcing" when either the authenticator or the authorizer are not their "allow-all" variants.
-///
-/// Put differently, when access control is not enforcing, all operations on resources will be allowed and users do not
-/// need to authenticate themselves.
-///
-bool is_enforcing(const service&);
-
-///
-/// Protected resources cannot be modified even if the performer has permissions to do so.
-///
-bool is_protected(const service&, const resource&) noexcept;
-
-///
-/// Create a role with optional authentication information.
-///
-/// \returns an exceptional future with \ref role_already_exists if the user or role exists.
-///
-/// \returns an exceptional future with \ref unsupported_authentication_option if an unsupported option is included.
-///
-future<> create_role(
-        const service&,
-        std::string_view name,
-        const role_config&,
-        const authentication_options&);
-
-///
-/// Alter an existing role and its authentication information.
-///
-/// \returns an exceptional future with \ref nonexistant_role if the named role does not exist.
-///
-/// \returns an exceptional future with \ref unsupported_authentication_option if an unsupported option is included.
-///
-future<> alter_role(
-        const service&,
-        std::string_view name,
-        const role_config_update&,
-        const authentication_options&);
-
-///
-/// Drop a role from the system, including all permissions and authentication information.
-///
-/// \returns an exceptional future with \ref nonexistant_role if the named role does not exist.
-///
-future<> drop_role(const service&, std::string_view name);
-
-///
-/// Check if `grantee` has been granted the named role.
-///
-/// \returns an exceptional future with \ref nonexistent_role if `grantee` or `name` do not exist.
-///
-future<bool> has_role(const service&, std::string_view grantee, std::string_view name);
-///
-/// Check if the authenticated user has been granted the named role.
-///
-/// \returns an exceptional future with \ref nonexistent_role if the user or `name` do not exist.
-///
-future<bool> has_role(const service&, const authenticated_user&, std::string_view name);
-
-///
-/// \returns an exceptional future with \ref nonexistent_role if the named role does not exist.
-///
-/// \returns an exceptional future with \ref unsupported_authorization_operation if granting permissions is not
-/// supported.
-///
-future<> grant_permissions(
-        const service&,
-        std::string_view role_name,
-        permission_set,
-        const resource&);
-
-///
-/// Like \ref grant_permissions, but grants all applicable permissions on the resource.
-///
-/// \returns an exceptional future with \ref nonexistent_role if the named role does not exist.
-///
-/// \returns an exceptional future with \ref unsupported_authorization_operation if granting permissions is not
-/// supported.
-///
-future<> grant_applicable_permissions(const service&, std::string_view role_name, const resource&);
-future<> grant_applicable_permissions(const service&, const authenticated_user&, const resource&);
-
-///
-/// \returns an exceptional future with \ref nonexistent_role if the named role does not exist.
-///
-/// \returns an exceptional future with \ref unsupported_authorization_operation if revoking permissions is not
-/// supported.
-///
-future<> revoke_permissions(
-        const service&,
-        std::string_view role_name,
-        permission_set,
-        const resource&);
-
-using recursive_permissions = bool_class<struct recursive_permissions_tag>;
-
-///
-/// Query for all granted permissions according to filtering criteria.
-///
-/// Only permissions included in the provided set are included.
-///
-/// If a role name is provided, only permissions granted (directly or recursively) to the role are included.
-///
-/// If a resource filter is provided, only permissions granted on the resource are included. When \ref
-/// recursive_permissions is `true`, permissions on a parent resource are included.
-///
-/// \returns an exceptional future with \ref nonexistent_role if a role name is included which refers to a role that
-/// does not exist.
-///
-/// \returns an exceptional future with \ref unsupported_authorization_operation if listing permissions is not
-/// supported.
-///
-future<std::vector<permission_details>> list_filtered_permissions(
-        const service&,
-        permission_set,
-        std::optional<std::string_view> role_name,
-        const std::optional<std::pair<resource, recursive_permissions>>& resource_filter);
+future<bool> is_super_user(const service&, const authenticated_user&);
 
 }

auth/standard_role_manager.cc

@@ -1,547 +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/standard_role_manager.hh"
-
-#include <optional>
-#include <unordered_set>
-#include <vector>
-
-#include <boost/algorithm/string/join.hpp>
-#include <seastar/core/future-util.hh>
-#include <seastar/core/print.hh>
-#include <seastar/core/sleep.hh>
-#include <seastar/core/sstring.hh>
-#include <seastar/core/thread.hh>
-
-#include "auth/common.hh"
-#include "auth/roles-metadata.hh"
-#include "cql3/query_processor.hh"
-#include "db/consistency_level_type.hh"
-#include "exceptions/exceptions.hh"
-#include "log.hh"
-#include "utils/class_registrator.hh"
-#include "database.hh"
-
-namespace auth {
-
-namespace meta {
-
-namespace role_members_table {
-
-constexpr std::string_view name{"role_members" , 12};
-
-static std::string_view qualified_name() noexcept {
-    static const sstring instance = AUTH_KS + "." + sstring(name);
-    return instance;
-}
-
-}
-
-}
-
-static logging::logger log("standard_role_manager");
-
-static const class_registrator<
-        role_manager,
-        standard_role_manager,
-        cql3::query_processor&,
-        ::service::migration_manager&> registration("org.apache.cassandra.auth.CassandraRoleManager");
-
-struct record final {
-    sstring name;
-    bool is_superuser;
-    bool can_login;
-    role_set member_of;
-};
-
-static db::consistency_level consistency_for_role(std::string_view role_name) noexcept {
-    if (role_name == meta::DEFAULT_SUPERUSER_NAME) {
-        return db::consistency_level::QUORUM;
-    }
-
-    return db::consistency_level::LOCAL_ONE;
-}
-
-static future<std::optional<record>> find_record(cql3::query_processor& qp, std::string_view role_name) {
-    static const sstring query = format("SELECT * FROM {} WHERE {} = ?",
-            meta::roles_table::qualified_name(),
-            meta::roles_table::role_col_name);
-
-    return qp.process(
-            query,
-            consistency_for_role(role_name),
-            internal_distributed_timeout_config(),
-            {sstring(role_name)},
-            true).then([](::shared_ptr<cql3::untyped_result_set> results) {
-        if (results->empty()) {
-            return std::optional<record>();
-        }
-
-        const cql3::untyped_result_set_row& row = results->one();
-
-        return std::make_optional(
-                record{
-                        row.get_as<sstring>(sstring(meta::roles_table::role_col_name)),
-                        row.get_as<bool>("is_superuser"),
-                        row.get_as<bool>("can_login"),
-                        (row.has("member_of")
-                                 ? row.get_set<sstring>("member_of")
-                                 : role_set())});
-    });
-}
-
-static future<record> require_record(cql3::query_processor& qp, std::string_view role_name) {
-    return find_record(qp, role_name).then([role_name](std::optional<record> mr) {
-        if (!mr) {
-            throw nonexistant_role(role_name);
-        }
-
-        return make_ready_future<record>(*mr);
-   });
-}
-
-static bool has_can_login(const cql3::untyped_result_set_row& row) {
-    return row.has("can_login") && !(boolean_type->deserialize(row.get_blob("can_login")).is_null());
-}
-
-std::string_view standard_role_manager_name() noexcept {
-    static const sstring instance = meta::AUTH_PACKAGE_NAME + "CassandraRoleManager";
-    return instance;
-}
-
-std::string_view standard_role_manager::qualified_java_name() const noexcept {
-    return standard_role_manager_name();
-}
-
-const resource_set& standard_role_manager::protected_resources() const {
-    static const resource_set resources({
-            make_data_resource(meta::AUTH_KS, meta::roles_table::name),
-            make_data_resource(meta::AUTH_KS, meta::role_members_table::name)});
-
-    return resources;
-}
-
-future<> standard_role_manager::create_metadata_tables_if_missing() const {
-    static const sstring create_role_members_query = sprint(
-            "CREATE TABLE %s ("
-            "  role text,"
-            "  member text,"
-            "  PRIMARY KEY (role, member)"
-            ")",
-            meta::role_members_table::qualified_name());
-
-
-    return when_all_succeed(
-            create_metadata_table_if_missing(
-                    meta::roles_table::name,
-                    _qp,
-                    meta::roles_table::creation_query(),
-                    _migration_manager),
-            create_metadata_table_if_missing(
-                    meta::role_members_table::name,
-                    _qp,
-                    create_role_members_query,
-                    _migration_manager));
-}
-
-future<> standard_role_manager::create_default_role_if_missing() const {
-    return default_role_row_satisfies(_qp, &has_can_login).then([this](bool exists) {
-        if (!exists) {
-            static const sstring query = format("INSERT INTO {} ({}, is_superuser, can_login) VALUES (?, true, true)",
-                    meta::roles_table::qualified_name(),
-                    meta::roles_table::role_col_name);
-
-            return _qp.process(
-                    query,
-                    db::consistency_level::QUORUM,
-                    internal_distributed_timeout_config(),
-                    {meta::DEFAULT_SUPERUSER_NAME}).then([](auto&&) {
-                log.info("Created default superuser role '{}'.", meta::DEFAULT_SUPERUSER_NAME);
-                return make_ready_future<>();
-            });
-        }
-
-        return make_ready_future<>();
-    }).handle_exception_type([](const exceptions::unavailable_exception& e) {
-        log.warn("Skipped default role setup: some nodes were not ready; will retry");
-        return make_exception_future<>(e);
-    });
-}
-
-static const sstring legacy_table_name{"users"};
-
-bool standard_role_manager::legacy_metadata_exists() const {
-    return _qp.db().has_schema(meta::AUTH_KS, legacy_table_name);
-}
-
-future<> standard_role_manager::migrate_legacy_metadata() const {
-    log.info("Starting migration of legacy user metadata.");
-    static const sstring query = format("SELECT * FROM {}.{}", meta::AUTH_KS, legacy_table_name);
-
-    return _qp.process(
-            query,
-            db::consistency_level::QUORUM,
-            internal_distributed_timeout_config()).then([this](::shared_ptr<cql3::untyped_result_set> results) {
-        return do_for_each(*results, [this](const cql3::untyped_result_set_row& row) {
-            role_config config;
-            config.is_superuser = row.get_as<bool>("super");
-            config.can_login = true;
-
-            return do_with(
-                    row.get_as<sstring>("name"),
-                    std::move(config),
-                    [this](const auto& name, const auto& config) {
-                return this->create_or_replace(name, config);
-            });
-        }).finally([results] {});
-    }).then([] {
-        log.info("Finished migrating legacy user metadata.");
-    }).handle_exception([](std::exception_ptr ep) {
-        log.error("Encountered an error during migration!");
-        std::rethrow_exception(ep);
-    });
-}
-
-future<> standard_role_manager::start() {
-    return once_among_shards([this] {
-        return this->create_metadata_tables_if_missing().then([this] {
-            _stopped = auth::do_after_system_ready(_as, [this] {
-                return seastar::async([this] {
-                    wait_for_schema_agreement(_migration_manager, _qp.db(), _as).get0();
-
-                    if (any_nondefault_role_row_satisfies(_qp, &has_can_login).get0()) {
-                        if (this->legacy_metadata_exists()) {
-                            log.warn("Ignoring legacy user metadata since nondefault roles already exist.");
-                        }
-
-                        return;
-                    }
-
-                    if (this->legacy_metadata_exists()) {
-                        this->migrate_legacy_metadata().get0();
-                        return;
-                    }
-
-                    create_default_role_if_missing().get0();
-                });
-            });
-        });
-    });
-}
-
-future<> standard_role_manager::stop() {
-    _as.request_abort();
-    return _stopped.handle_exception_type([] (const sleep_aborted&) { }).handle_exception_type([](const abort_requested_exception&) {});;
-}
-
-future<> standard_role_manager::create_or_replace(std::string_view role_name, const role_config& c) const {
-    static const sstring query = format("INSERT INTO {} ({}, is_superuser, can_login) VALUES (?, ?, ?)",
-            meta::roles_table::qualified_name(),
-            meta::roles_table::role_col_name);
-
-    return _qp.process(
-            query,
-            consistency_for_role(role_name),
-            internal_distributed_timeout_config(),
-            {sstring(role_name), c.is_superuser, c.can_login},
-            true).discard_result();
-}
-
-future<>
-standard_role_manager::create(std::string_view role_name, const role_config& c) const {
-    return this->exists(role_name).then([this, role_name, &c](bool role_exists) {
-        if (role_exists) {
-            throw role_already_exists(role_name);
-        }
-
-        return this->create_or_replace(role_name, c);
-    });
-}
-
-future<>
-standard_role_manager::alter(std::string_view role_name, const role_config_update& u) const {
-    static const auto build_column_assignments = [](const role_config_update& u) -> sstring {
-        std::vector<sstring> assignments;
-
-        if (u.is_superuser) {
-            assignments.push_back(sstring("is_superuser = ") + (*u.is_superuser ? "true" : "false"));
-        }
-
-        if (u.can_login) {
-            assignments.push_back(sstring("can_login = ") + (*u.can_login ? "true" : "false"));
-        }
-
-        return boost::algorithm::join(assignments, ", ");
-    };
-
-    return require_record(_qp, role_name).then([this, role_name, &u](record) {
-        if (!u.is_superuser && !u.can_login) {
-            return make_ready_future<>();
-        }
-
-        return _qp.process(
-                format("UPDATE {} SET {} WHERE {} = ?",
-                        meta::roles_table::qualified_name(),
-                        build_column_assignments(u),
-                        meta::roles_table::role_col_name),
-                consistency_for_role(role_name),
-                internal_distributed_timeout_config(),
-                {sstring(role_name)}).discard_result();
-    });
-}
-
-future<> standard_role_manager::drop(std::string_view role_name) const {
-    return this->exists(role_name).then([this, role_name](bool role_exists) {
-        if (!role_exists) {
-            throw nonexistant_role(role_name);
-        }
-
-        // First, revoke this role from all roles that are members of it.
-        const auto revoke_from_members = [this, role_name] {
-            static const sstring query = format("SELECT member FROM {} WHERE role = ?",
-                    meta::role_members_table::qualified_name());
-
-            return _qp.process(
-                    query,
-                    consistency_for_role(role_name),
-                    internal_distributed_timeout_config(),
-                    {sstring(role_name)}).then([this, role_name](::shared_ptr<cql3::untyped_result_set> members) {
-                return parallel_for_each(
-                        members->begin(),
-                        members->end(),
-                        [this, role_name](const cql3::untyped_result_set_row& member_row) {
-                    const sstring member = member_row.template get_as<sstring>("member");
-                    return this->modify_membership(member, role_name, membership_change::remove);
-                }).finally([members] {});
-            });
-        };
-
-        // In parallel, revoke all roles that this role is members of.
-        const auto revoke_members_of = [this, grantee = role_name] {
-            return this->query_granted(
-                    grantee,
-                    recursive_role_query::no).then([this, grantee](role_set granted_roles) {
-                return do_with(
-                        std::move(granted_roles),
-                        [this, grantee](const role_set& granted_roles) {
-                    return parallel_for_each(
-                            granted_roles.begin(),
-                            granted_roles.end(),
-                            [this, grantee](const sstring& role_name) {
-                        return this->modify_membership(grantee, role_name, membership_change::remove);
-                    });
-                });
-            });
-        };
-
-        // Finally, delete the role itself.
-        auto delete_role = [this, role_name] {
-            static const sstring query = format("DELETE FROM {} WHERE {} = ?",
-                    meta::roles_table::qualified_name(),
-                    meta::roles_table::role_col_name);
-
-            return _qp.process(
-                    query,
-                    consistency_for_role(role_name),
-                    internal_distributed_timeout_config(),
-                    {sstring(role_name)}).discard_result();
-        };
-
-        return when_all_succeed(revoke_from_members(), revoke_members_of()).then([delete_role = std::move(delete_role)] {
-            return delete_role();
-        });
-    });
-}
-
-future<>
-standard_role_manager::modify_membership(
-        std::string_view grantee_name,
-        std::string_view role_name,
-        membership_change ch) const {
-
-
-    const auto modify_roles = [this, role_name, grantee_name, ch] {
-        const auto query = format(
-                "UPDATE {} SET member_of = member_of {} ? WHERE {} = ?",
-                meta::roles_table::qualified_name(),
-                (ch == membership_change::add ? '+' : '-'),
-                meta::roles_table::role_col_name);
-
-        return _qp.process(
-                query,
-                consistency_for_role(grantee_name),
-                internal_distributed_timeout_config(),
-                {role_set{sstring(role_name)}, sstring(grantee_name)}).discard_result();
-    };
-
-    const auto modify_role_members = [this, role_name, grantee_name, ch] {
-        switch (ch) {
-            case membership_change::add:
-                return _qp.process(
-                        format("INSERT INTO {} (role, member) VALUES (?, ?)",
-                                meta::role_members_table::qualified_name()),
-                        consistency_for_role(role_name),
-                        internal_distributed_timeout_config(),
-                        {sstring(role_name), sstring(grantee_name)}).discard_result();
-
-            case membership_change::remove:
-                return _qp.process(
-                        format("DELETE FROM {} WHERE role = ? AND member = ?",
-                                meta::role_members_table::qualified_name()),
-                        consistency_for_role(role_name),
-                        internal_distributed_timeout_config(),
-                        {sstring(role_name), sstring(grantee_name)}).discard_result();
-        }
-
-        return make_ready_future<>();
-    };
-
-    return when_all_succeed(modify_roles(), modify_role_members());
-}
-
-future<>
-standard_role_manager::grant(std::string_view grantee_name, std::string_view role_name) const {
-    const auto check_redundant = [this, role_name, grantee_name] {
-        return this->query_granted(
-                grantee_name,
-                recursive_role_query::yes).then([role_name, grantee_name](role_set roles) {
-            if (roles.count(sstring(role_name)) != 0) {
-                throw role_already_included(grantee_name, role_name);
-            }
-
-            return make_ready_future<>();
-        });
-    };
-
-    const auto check_cycle = [this, role_name, grantee_name] {
-        return this->query_granted(
-                role_name,
-                recursive_role_query::yes).then([role_name, grantee_name](role_set roles) {
-            if (roles.count(sstring(grantee_name)) != 0) {
-                throw role_already_included(role_name, grantee_name);
-            }
-
-            return make_ready_future<>();
-        });
-    };
-
-   return when_all_succeed(check_redundant(), check_cycle()).then([this, role_name, grantee_name] {
-       return this->modify_membership(grantee_name, role_name, membership_change::add);
-   });
-}
-
-future<>
-standard_role_manager::revoke(std::string_view revokee_name, std::string_view role_name) const {
-    return this->exists(role_name).then([this, revokee_name, role_name](bool role_exists) {
-        if (!role_exists) {
-            throw nonexistant_role(sstring(role_name));
-        }
-    }).then([this, revokee_name, role_name] {
-        return this->query_granted(
-                revokee_name,
-                recursive_role_query::no).then([revokee_name, role_name](role_set roles) {
-            if (roles.count(sstring(role_name)) == 0) {
-                throw revoke_ungranted_role(revokee_name, role_name);
-            }
-
-            return make_ready_future<>();
-        }).then([this, revokee_name, role_name] {
-            return this->modify_membership(revokee_name, role_name, membership_change::remove);
-        });
-    });
-}
-
-static future<> collect_roles(
-        cql3::query_processor& qp,
-        std::string_view grantee_name,
-        bool recurse,
-        role_set& roles) {
-    return require_record(qp, grantee_name).then([&qp, &roles, recurse](record r) {
-        return do_with(std::move(r.member_of), [&qp, &roles, recurse](const role_set& memberships) {
-            return do_for_each(memberships.begin(), memberships.end(), [&qp, &roles, recurse](const sstring& role_name) {
-                roles.insert(role_name);
-
-                if (recurse) {
-                    return collect_roles(qp, role_name, true, roles);
-                }
-
-                return make_ready_future<>();
-            });
-        });
-    });
-}
-
-future<role_set> standard_role_manager::query_granted(std::string_view grantee_name, recursive_role_query m) const {
-    const bool recurse = (m == recursive_role_query::yes);
-
-    return do_with(
-            role_set{sstring(grantee_name)},
-            [this, grantee_name, recurse](role_set& roles) {
-        return collect_roles(_qp, grantee_name, recurse, roles).then([&roles] { return roles; });
-    });
-}
-
-future<role_set> standard_role_manager::query_all() const {
-    static const sstring query = format("SELECT {} FROM {}",
-            meta::roles_table::role_col_name,
-            meta::roles_table::qualified_name());
-
-    // To avoid many copies of a view.
-    static const auto role_col_name_string = sstring(meta::roles_table::role_col_name);
-
-    return _qp.process(
-            query,
-            db::consistency_level::QUORUM,
-            internal_distributed_timeout_config()).then([](::shared_ptr<cql3::untyped_result_set> results) {
-        role_set roles;
-
-        std::transform(
-                results->begin(),
-                results->end(),
-                std::inserter(roles, roles.begin()),
-                [](const cql3::untyped_result_set_row& row) {
-            return row.get_as<sstring>(role_col_name_string);
-        });
-
-        return roles;
-    });
-}
-
-future<bool> standard_role_manager::exists(std::string_view role_name) const  {
-    return find_record(_qp, role_name).then([](std::optional<record> mr) {
-        return static_cast<bool>(mr);
-    });
-}
-
-future<bool> standard_role_manager::is_superuser(std::string_view role_name) const {
-    return require_record(_qp, role_name).then([](record r) {
-        return r.is_superuser;
-    });
-}
-
-future<bool> standard_role_manager::can_login(std::string_view role_name) const {
-    return require_record(_qp, role_name).then([](record r) {
-        return r.can_login;
-    });
-}
-
-}

auth/standard_role_manager.hh

@@ -1,104 +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 "auth/role_manager.hh"
-
-#include <string_view>
-#include <unordered_set>
-
-#include <seastar/core/abort_source.hh>
-#include <seastar/core/future.hh>
-#include <seastar/core/sstring.hh>
-
-#include "seastarx.hh"
-
-namespace cql3 {
-class query_processor;
-}
-
-namespace service {
-class migration_manager;
-}
-
-namespace auth {
-
-std::string_view standard_role_manager_name() noexcept;
-
-class standard_role_manager final : public role_manager {
-    cql3::query_processor& _qp;
-    ::service::migration_manager& _migration_manager;
-    future<> _stopped;
-    seastar::abort_source _as;
-
-public:
-    standard_role_manager(cql3::query_processor& qp, ::service::migration_manager& mm)
-            : _qp(qp)
-            , _migration_manager(mm)
-            , _stopped(make_ready_future<>()) {
-    }
-
-    virtual std::string_view qualified_java_name() const noexcept override;
-
-    virtual const resource_set& protected_resources() const override;
-
-    virtual future<> start() override;
-
-    virtual future<> stop() override;
-
-    virtual future<> create(std::string_view role_name, const role_config&) const override;
-
-    virtual future<> drop(std::string_view role_name) const override;
-
-    virtual future<> alter(std::string_view role_name, const role_config_update&) const override;
-
-    virtual future<> grant(std::string_view grantee_name, std::string_view role_name) const override;
-
-    virtual future<> revoke(std::string_view revokee_name, std::string_view role_name) const override;
-
-    virtual future<role_set> query_granted(std::string_view grantee_name, recursive_role_query) const override;
-
-    virtual future<role_set> query_all() const override;
-
-    virtual future<bool> exists(std::string_view role_name) const override;
-
-    virtual future<bool> is_superuser(std::string_view role_name) const override;
-
-    virtual future<bool> can_login(std::string_view role_name) const override;
-
-private:
-    enum class membership_change { add, remove };
-
-    future<> create_metadata_tables_if_missing() const;
-
-    bool legacy_metadata_exists() const;
-
-    future<> migrate_legacy_metadata() const;
-
-    future<> create_default_role_if_missing() const;
-
-    future<> create_or_replace(std::string_view role_name, const role_config&) const;
-
-    future<> modify_membership(std::string_view role_name, std::string_view grantee_name, membership_change) const;
-};
-
-}

auth/transitional.cc

@@ -39,16 +39,20 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "auth/authenticated_user.hh"
-#include "auth/authenticator.hh"
-#include "auth/authorizer.hh"
-#include "auth/default_authorizer.hh"
-#include "auth/password_authenticator.hh"
-#include "auth/permission.hh"
+#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() {
@@ -63,47 +67,38 @@ static const sstring& transitional_authorizer_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::make_unique<password_authenticator>(qp, mm))
+    {}
     transitional_authenticator(std::unique_ptr<authenticator> a)
-            : _authenticator(std::move(a)) {
-    }
-
-    virtual future<> start() override {
+        : _authenticator(std::move(a))
+    {}
+    future<> start() override {
         return _authenticator->start();
     }
-
-    virtual future<> stop() override {
+    future<> stop() override {
         return _authenticator->stop();
     }
-
-    virtual const sstring& qualified_java_name() const override {
+    const sstring& qualified_java_name() const override {
         return transitional_authenticator_name();
     }
-
-    virtual bool require_authentication() const override {
+    bool require_authentication() const override {
         return true;
     }
-
-    virtual authentication_option_set supported_options() const override {
+    option_set supported_options() const override {
         return _authenticator->supported_options();
     }
-
-    virtual authentication_option_set alterable_options() const override {
+    option_set alterable_options() const override {
         return _authenticator->alterable_options();
     }
-
-    virtual future<authenticated_user> authenticate(const credentials_map& credentials) const override {
+    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())) {
+        if ((i == credentials.end() || i->second.empty()) && (!credentials.count(PASSWORD_KEY) || credentials.at(PASSWORD_KEY).empty())) {
             // return anon user
-            return make_ready_future<authenticated_user>(anonymous_user());
+            return make_ready_future<::shared_ptr<authenticated_user>>(::make_shared<authenticated_user>());
         }
         return make_ready_future().then([this, &credentials] {
             return _authenticator->authenticate(credentials);
@@ -112,39 +107,29 @@ public:
                 std::rethrow_exception(ep);
             } catch (exceptions::authentication_exception&) {
                 // return anon user
-                return make_ready_future<authenticated_user>(anonymous_user());
+                return make_ready_future<::shared_ptr<authenticated_user>>(::make_shared<authenticated_user>());
             }
         });
     }
-
-    virtual future<> create(std::string_view role_name, const authentication_options& options) const override {
-        return _authenticator->create(role_name, options);
+    future<> create(sstring username, const option_map& options) override {
+        return _authenticator->create(username, options);
     }
-
-    virtual future<> alter(std::string_view role_name, const authentication_options& options) const override {
-        return _authenticator->alter(role_name, options);
+    future<> alter(sstring username, const option_map& options) override {
+        return _authenticator->alter(username, options);
     }
-
-    virtual future<> drop(std::string_view role_name) const override {
-        return _authenticator->drop(role_name);
+    future<> drop(sstring username) override {
+        return _authenticator->drop(username);
     }
-
-    virtual future<custom_options> query_custom_options(std::string_view role_name) const override {
-        return _authenticator->query_custom_options(role_name);
-    }
-
-    virtual const resource_set& protected_resources() const override {
+    const resource_ids& protected_resources() const override {
         return _authenticator->protected_resources();
     }
-
-    virtual ::shared_ptr<sasl_challenge> new_sasl_challenge() const override {
+    ::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)) {
-            }
-
-            virtual bytes evaluate_response(bytes_view client_response) override {
+                : _sasl(std::move(sasl))
+            {}
+            bytes evaluate_response(bytes_view client_response) override {
                 try {
                     return _sasl->evaluate_response(client_response);
                 } catch (exceptions::authentication_exception&) {
@@ -152,27 +137,23 @@ public:
                     return {};
                 }
             }
-
-            virtual bool is_complete() const override {
+            bool is_complete() const {
                 return _complete || _sasl->is_complete();
             }
-
-            virtual future<authenticated_user> get_authenticated_user() const {
+            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<authenticated_user>(anonymous_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());
@@ -181,65 +162,55 @@ public:
 
 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::make_unique<default_authorizer>(qp, mm))
+    {}
     transitional_authorizer(std::unique_ptr<authorizer> a)
-            : _authorizer(std::move(a)) {
-    }
-
-    ~transitional_authorizer() {
-    }
-
-    virtual future<> start() override {
+        : _authorizer(std::move(a))
+    {}
+    ~transitional_authorizer()
+    {}
+    future<> start() override {
         return _authorizer->start();
     }
-
-    virtual future<> stop() override {
+    future<> stop() override {
         return _authorizer->stop();
     }
-
-    virtual const sstring& qualified_java_name() const override {
+    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>();
 
-    virtual future<permission_set> authorize(const role_or_anonymous&, const resource&) const override {
-        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>(transitional_permissions);
+            return make_ready_future<permission_set>(s ? permissions::ALL : transitional_permissions);
+        });
     }
-
-    virtual future<> grant(std::string_view s, permission_set ps, const resource& r) const override {
-        return _authorizer->grant(s, std::move(ps), r);
+    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));
     }
-
-    virtual future<> revoke(std::string_view s, permission_set ps, const resource& r) const override {
-        return _authorizer->revoke(s, std::move(ps), r);
+    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));
     }
-
-    virtual future<std::vector<permission_details>> list_all() const override {
-        return _authorizer->list_all();
+    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));
     }
-
-    virtual future<> revoke_all(std::string_view s) const override {
-        return _authorizer->revoke_all(s);
+    future<> revoke_all(sstring s) override {
+        return _authorizer->revoke_all(std::move(s));
     }
-
-    virtual future<> revoke_all(const resource& r) const override {
-        return _authorizer->revoke_all(r);
+    future<> revoke_all(data_resource r) override {
+        return _authorizer->revoke_all(std::move(r));
     }
-
-    virtual const resource_set& protected_resources() const override {
+    const resource_ids& protected_resources() override {
         return _authorizer->protected_resources();
     }
+    future<> validate_configuration() const override {
+        return _authorizer->validate_configuration();
+    }
 };
 
 }
@@ -252,10 +223,10 @@ static const class_registrator<
         auth::authenticator,
         auth::transitional_authenticator,
         cql3::query_processor&,
-        ::service::migration_manager&> transitional_authenticator_reg(auth::PACKAGE_NAME + "TransitionalAuthenticator");
+        ::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(auth::PACKAGE_NAME + "TransitionalAuthorizer");
+        ::service::migration_manager&> transitional_authorizer_reg("com.scylladb.auth.TransitionalAuthorizer");

backlog_controller.hh

@@ -1,146 +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/scheduling.hh>
-#include <seastar/core/timer.hh>
-#include <seastar/core/gate.hh>
-#include <chrono>
-
-// Simple proportional controller to adjust shares for processes for which a backlog can be clearly
-// defined.
-//
-// Goal is to consume the backlog 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 quota.
-//
-// What that translates to is we'll try to keep the backlog's firt derivative at 0 (IOW, we keep
-// backlog constant). As the backlog grows we increase CPU usage, decreasing CPU usage as the
-// backlog diminishes.
-//
-// The exact point at which the controller stops determines the desired CPU usage. As the backlog
-// grows and approach a maximum desired, we need to be more aggressive. We will therefore define two
-// thresholds, and increase the constant as we cross them.
-//
-// Doing that divides the range in three (before the first, between first and second, and after
-// second threshold), and we'll be slow to grow in the first region, grow normally in the second
-// region, and aggressively in the third region.
-//
-// The constants q1 and q2 are used to determine the proportional factor at each stage.
-class backlog_controller {
-public:
-    future<> shutdown() {
-        _update_timer.cancel();
-        return std::move(_inflight_update);
-    }
-protected:
-    struct control_point {
-        float input;
-        float output;
-    };
-
-    seastar::scheduling_group _scheduling_group;
-    const ::io_priority_class& _io_priority;
-    std::chrono::milliseconds _interval;
-    timer<> _update_timer;
-
-    std::vector<control_point> _control_points;
-
-    std::function<float()> _current_backlog;
-    // updating shares for an I/O class may contact another shard and returns a future.
-    future<> _inflight_update;
-
-    virtual void update_controller(float quota);
-
-    void adjust();
-
-    backlog_controller(seastar::scheduling_group sg, const ::io_priority_class& iop, std::chrono::milliseconds interval,
-                       std::vector<control_point> control_points, std::function<float()> backlog)
-        : _scheduling_group(sg)
-        , _io_priority(iop)
-        , _interval(interval)
-        , _update_timer([this] { adjust(); })
-        , _control_points()
-        , _current_backlog(std::move(backlog))
-        , _inflight_update(make_ready_future<>())
-    {
-        _control_points.insert(_control_points.end(), control_points.begin(), control_points.end());
-         _update_timer.arm_periodic(_interval);
-    }
-
-    // Used when the controllers are disabled and a static share is used
-    // When that option is deprecated we should remove this.
-    backlog_controller(seastar::scheduling_group sg, const ::io_priority_class& iop, float static_shares) 
-        : _scheduling_group(sg)
-        , _io_priority(iop)
-        , _inflight_update(make_ready_future<>())
-    {
-        update_controller(static_shares);
-    }
-
-    virtual ~backlog_controller() {}
-public:
-    backlog_controller(backlog_controller&&) = default;
-    float backlog_of_shares(float shares) const;
-    seastar::scheduling_group sg() {
-        return _scheduling_group;
-    }
-};
-
-// memtable flush CPU controller.
-//
-// - First threshold is the soft limit line,
-// - Maximum is the point in which we'd stop consuming request,
-// - Second threshold is halfway between them.
-//
-// 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.
-class flush_controller : public backlog_controller {
-    static constexpr float hard_dirty_limit = 1.0f;
-public:
-    flush_controller(seastar::scheduling_group sg, const ::io_priority_class& iop, float static_shares) : backlog_controller(sg, iop, static_shares) {}
-    flush_controller(seastar::scheduling_group sg, const ::io_priority_class& iop, std::chrono::milliseconds interval, float soft_limit, std::function<float()> current_dirty)
-        : backlog_controller(sg, iop, std::move(interval),
-          std::vector<backlog_controller::control_point>({{0.0, 0.0}, {soft_limit, 10}, {soft_limit + (hard_dirty_limit - soft_limit) / 2, 200} , {hard_dirty_limit, 1000}}),
-          std::move(current_dirty)
-        )
-    {}
-};
-
-class compaction_controller : public backlog_controller {
-public:
-    static constexpr unsigned normalization_factor = 30;
-    static constexpr float disable_backlog = std::numeric_limits<double>::infinity();
-    static constexpr float backlog_disabled(float backlog) { return std::isinf(backlog); }
-    compaction_controller(seastar::scheduling_group sg, const ::io_priority_class& iop, float static_shares) : backlog_controller(sg, iop, static_shares) {}
-    compaction_controller(seastar::scheduling_group sg, const ::io_priority_class& iop, std::chrono::milliseconds interval, std::function<float()> current_backlog)
-        : backlog_controller(sg, iop, std::move(interval),
-          std::vector<backlog_controller::control_point>({{0.0, 50}, {1.5, 100} , {normalization_factor, 1000}}),
-          std::move(current_backlog)
-        )
-    {}
-};

bytes.cc

@@ -20,7 +20,7 @@
  */
 
 #include "bytes.hh"
-#include <seastar/core/print.hh>
+#include "core/print.hh"
 
 static inline int8_t hex_to_int(unsigned char c) {
     switch (c) {
@@ -55,7 +55,7 @@ bytes from_hex(sstring_view s) {
         auto half_byte1 = hex_to_int(s[i * 2]);
         auto half_byte2 = hex_to_int(s[i * 2 + 1]);
         if (half_byte1 == -1 || half_byte2 == -1) {
-            throw std::invalid_argument(format("Non-hex characters in {}", s));
+            throw std::invalid_argument(sprint("Non-hex characters in %s", s));
         }
         out[i] = (half_byte1 << 4) | half_byte2;
     }

bytes.hh

@@ -22,22 +22,18 @@
 #pragma once
 
 #include "seastarx.hh"
-#include <seastar/core/sstring.hh>
+#include "core/sstring.hh"
 #include "hashing.hh"
-#include <optional>
+#include <experimental/optional>
 #include <iosfwd>
 #include <functional>
 #include "utils/mutable_view.hh"
 
-using bytes = basic_sstring<int8_t, uint32_t, 31, false>;
-using bytes_view = std::basic_string_view<int8_t>;
+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::optional<bytes>;
-using sstring_view = std::string_view;
-
-inline sstring_view to_sstring_view(bytes_view view) {
-    return {reinterpret_cast<const char*>(view.data()), view.size()};
-}
+using bytes_opt = std::experimental::optional<bytes>;
+using sstring_view = std::experimental::string_view;
 
 namespace std {
 
@@ -82,11 +78,3 @@ struct appending_hash<bytes_view> {
         h.update(reinterpret_cast<const char*>(v.begin()), v.size() * sizeof(bytes_view::value_type));
     }
 };
-
-inline int32_t compare_unsigned(bytes_view v1, bytes_view v2) {
-    auto n = memcmp(v1.begin(), v2.begin(), std::min(v1.size(), v2.size()));
-    if (n) {
-        return n;
-    }
-    return (int32_t) (v1.size() - v2.size());
-}

bytes_ostream.hh

@@ -24,9 +24,9 @@
 #include <boost/range/iterator_range.hpp>
 
 #include "bytes.hh"
-#include <seastar/core/unaligned.hh>
+#include "core/unaligned.hh"
 #include "hashing.hh"
-#include <seastar/core/simple-stream.hh>
+#include "seastar/core/simple-stream.hh"
 /**
  * Utility for writing data into a buffer when its final size is not known up front.
  *
@@ -38,7 +38,7 @@ class bytes_ostream {
 public:
     using size_type = bytes::size_type;
     using value_type = bytes::value_type;
-    static constexpr size_type max_chunk_size() { return 128 * 1024; }
+    static constexpr size_type max_chunk_size() { return 16 * 1024; }
 private:
     static_assert(sizeof(value_type) == 1, "value_type is assumed to be one byte long");
     struct chunk {
@@ -57,17 +57,16 @@ private:
         value_type data[0];
         void operator delete(void* ptr) { free(ptr); }
     };
-    static constexpr size_type default_chunk_size{512};
+    // FIXME: consider increasing chunk size as the buffer grows
+    static constexpr size_type chunk_size{512};
 private:
     std::unique_ptr<chunk> _begin;
     chunk* _current;
     size_type _size;
-    size_type _initial_chunk_size = default_chunk_size;
 public:
     class fragment_iterator : public std::iterator<std::input_iterator_tag, bytes_view> {
-        chunk* _current = nullptr;
+        chunk* _current;
     public:
-        fragment_iterator() = default;
         fragment_iterator(chunk* current) : _current(current) {}
         fragment_iterator(const fragment_iterator&) = default;
         fragment_iterator& operator=(const fragment_iterator&) = default;
@@ -102,13 +101,13 @@ private:
     }
     // Figure out next chunk size.
     //   - must be enough for data_size
-    //   - must be at least _initial_chunk_size
+    //   - must be at least chunk_size
     //   - try to double each time to prevent too many allocations
     //   - do not exceed max_chunk_size
     size_type next_alloc_size(size_t data_size) const {
         auto next_size = _current
                 ? _current->size * 2
-                : _initial_chunk_size;
+                : chunk_size;
         next_size = std::min(next_size, max_chunk_size());
         // FIXME: check for overflow?
         return std::max<size_type>(next_size, data_size + sizeof(chunk));
@@ -116,19 +115,13 @@ private:
     // Makes room for a contiguous region of given size.
     // The region is accounted for as already written.
     // size must not be zero.
-    [[gnu::always_inline]]
     value_type* alloc(size_type size) {
-        if (__builtin_expect(size <= current_space_left(), true)) {
+        if (size <= current_space_left()) {
             auto ret = _current->data + _current->offset;
             _current->offset += size;
             _size += size;
             return ret;
         } else {
-            return alloc_new(size);
-        }
-    }
-    [[gnu::noinline]]
-    value_type* alloc_new(size_type size) {
             auto alloc_size = next_alloc_size(size);
             auto space = malloc(alloc_size);
             if (!space) {
@@ -146,22 +139,19 @@ private:
             }
             _size += size;
             return _current->data;
+        };
     }
 public:
-    explicit bytes_ostream(size_t initial_chunk_size) noexcept
+    bytes_ostream() noexcept
         : _begin()
         , _current(nullptr)
         , _size(0)
-        , _initial_chunk_size(initial_chunk_size)
     { }
 
-    bytes_ostream() noexcept : bytes_ostream(default_chunk_size) {}
-
     bytes_ostream(bytes_ostream&& o) noexcept
         : _begin(std::move(o._begin))
         , _current(o._current)
         , _size(o._size)
-        , _initial_chunk_size(o._initial_chunk_size)
     {
         o._current = nullptr;
         o._size = 0;
@@ -171,7 +161,6 @@ public:
         : _begin()
         , _current(nullptr)
         , _size(0)
-        , _initial_chunk_size(o._initial_chunk_size)
     {
         append(o);
     }
@@ -209,20 +198,18 @@ public:
         return place_holder<T>{alloc(sizeof(T))};
     }
 
-    [[gnu::always_inline]]
     value_type* write_place_holder(size_type size) {
         return alloc(size);
     }
 
     // Writes given sequence of bytes
-    [[gnu::always_inline]]
     inline void write(bytes_view v) {
         if (v.empty()) {
             return;
         }
 
         auto this_size = std::min(v.size(), size_t(current_space_left()));
-        if (__builtin_expect(this_size, true)) {
+        if (this_size) {
             memcpy(_current->data + _current->offset, v.begin(), this_size);
             _current->offset += this_size;
             _size += this_size;
@@ -231,12 +218,11 @@ public:
 
         while (!v.empty()) {
             auto this_size = std::min(v.size(), size_t(max_chunk_size()));
-            std::copy_n(v.begin(), this_size, alloc_new(this_size));
+            std::copy_n(v.begin(), this_size, alloc(this_size));
             v.remove_prefix(this_size);
         }
     }
 
-    [[gnu::always_inline]]
     void write(const char* ptr, size_t size) {
         write(bytes_view(reinterpret_cast<const signed char*>(ptr), size));
     }
@@ -303,24 +289,6 @@ public:
         }
     }
 
-    // Removes n bytes from the end of the bytes_ostream.
-    // Beware of O(n) algorithm.
-    void remove_suffix(size_t n) {
-        _size -= n;
-        auto left = _size;
-        auto current = _begin.get();
-        while (current) {
-            if (current->offset >= left) {
-                current->offset = left;
-                _current = current;
-                current->next.reset();
-                return;
-            }
-            left -= current->offset;
-            current = current->next.get();
-        }
-    }
-
     // begin() and end() form an input range to bytes_view representing fragments.
     // Any modification of this instance invalidates iterators.
     fragment_iterator begin() const { return { _begin.get() }; }
@@ -406,19 +374,14 @@ public:
     bool operator!=(const bytes_ostream& other) const {
         return !(*this == other);
     }
+};
 
-    // Makes this instance empty.
-    //
-    // The first buffer is not deallocated, so callers may rely on the
-    // fact that if they write less than the initial chunk size between
-    // the clear() calls then writes will not involve any memory allocations,
-    // except for the first write made on this instance.
-    void clear() {
-        if (_begin) {
-            _begin->offset = 0;
-            _size = 0;
-            _current = _begin.get();
-            _begin->next.reset();
+template<>
+struct appending_hash<bytes_ostream> {
+    template<typename Hasher>
+    void operator()(Hasher& h, const bytes_ostream& b) const {
+        for (auto&& frag : b.fragments()) {
+            feed_hash(h, frag);
         }
     }
 };

cache_flat_mutation_reader.hh

@@ -24,7 +24,7 @@
 #include <vector>
 #include "row_cache.hh"
 #include "mutation_reader.hh"
-#include "mutation_fragment.hh"
+#include "streamed_mutation.hh"
 #include "partition_version.hh"
 #include "utils/logalloc.hh"
 #include "query-request.hh"
@@ -61,12 +61,11 @@ class cache_flat_mutation_reader final : public flat_mutation_reader::impl {
         // - _last_row points at a direct predecessor of the next row which is going to be read.
         //   Used for populating continuity.
         // - _population_range_starts_before_all_rows is set accordingly
-        // - _underlying is engaged and fast-forwarded
         reading_from_underlying,
 
         end_of_stream
     };
-    partition_snapshot_ptr _snp;
+    lw_shared_ptr<partition_snapshot> _snp;
     position_in_partition::tri_compare _position_cmp;
 
     query::clustering_key_filter_ranges _ck_ranges;
@@ -77,9 +76,19 @@ class cache_flat_mutation_reader final : public flat_mutation_reader::impl {
 
     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 rows with positions < _lower_bound have been emitted, and only
-    // range_tombstones with positions <= _lower_bound.
+    // 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;
 
@@ -95,39 +104,26 @@ class cache_flat_mutation_reader final : public flat_mutation_reader::impl {
     // Valid when _state == reading_from_underlying.
     bool _population_range_starts_before_all_rows;
 
-    // Whether _lower_bound was changed within current fill_buffer().
-    // If it did not then we cannot break out of it (e.g. on preemption) because
-    // forward progress is not guaranteed in case iterators are getting constantly invalidated.
-    bool _lower_bound_changed = false;
-
-    // Points to the underlying reader conforming to _schema,
-    // either to *_underlying_holder or _read_context->underlying().underlying().
-    flat_mutation_reader* _underlying = nullptr;
-    std::optional<flat_mutation_reader> _underlying_holder;
-
-    future<> do_fill_buffer(db::timeout_clock::time_point);
-    future<> ensure_underlying(db::timeout_clock::time_point);
+    future<> do_fill_buffer();
     void copy_from_cache_to_buffer();
-    future<> process_static_row(db::timeout_clock::time_point);
+    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(db::timeout_clock::time_point);
+    future<> read_from_underlying();
     void start_reading_from_underlying();
     bool after_current_range(position_in_partition_view position);
     bool can_populate() const;
-    // Marks the range between _last_row (exclusive) and _next_row (exclusive) as continuous,
-    // provided that the underlying reader still matches the latest version of the partition.
     void maybe_update_continuity();
-    // Tries to ensure that the lower bound of the current population range exists.
-    // Returns false if it failed and range cannot be populated.
-    // Assumes can_populate().
-    bool ensure_population_lower_bound();
     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);
@@ -138,13 +134,12 @@ class cache_flat_mutation_reader final : public flat_mutation_reader::impl {
         _end_of_stream = true;
         _state = state::end_of_stream;
     }
-    void touch_partition();
 public:
     cache_flat_mutation_reader(schema_ptr s,
                                dht::decorated_key dk,
                                query::clustering_key_filter_ranges&& crr,
                                lw_shared_ptr<read_context> ctx,
-                               partition_snapshot_ptr snp,
+                               lw_shared_ptr<partition_snapshot> snp,
                                row_cache& cache)
         : flat_mutation_reader::impl(std::move(s))
         , _snp(std::move(snp))
@@ -153,6 +148,7 @@ public:
         , _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))
@@ -163,60 +159,55 @@ public:
     }
     cache_flat_mutation_reader(const cache_flat_mutation_reader&) = delete;
     cache_flat_mutation_reader(cache_flat_mutation_reader&&) = delete;
-    virtual future<> fill_buffer(db::timeout_clock::time_point timeout) override;
+    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&, db::timeout_clock::time_point timeout) override {
+    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, db::timeout_clock::time_point timeout) override {
+    virtual future<> fast_forward_to(position_range pr) override {
         throw std::bad_function_call();
     }
 };
 
 inline
-future<> cache_flat_mutation_reader::process_static_row(db::timeout_clock::time_point timeout) {
-    if (_snp->static_row_continuous()) {
+future<> cache_flat_mutation_reader::process_static_row() {
+    if (_snp->version()->partition().static_row_continuous()) {
         _read_context->cache().on_row_hit();
-        static_row sr = _lsa_manager.run_in_read_section([this] {
-            return _snp->static_row(_read_context->digest_requested());
+        row sr = _lsa_manager.run_in_read_section([this] {
+            return _snp->static_row();
         });
         if (!sr.empty()) {
-            push_mutation_fragment(mutation_fragment(std::move(sr)));
+            push_mutation_fragment(mutation_fragment(static_row(std::move(sr))));
         }
         return make_ready_future<>();
     } else {
         _read_context->cache().on_row_miss();
-        return ensure_underlying(timeout).then([this, timeout] {
-            return (*_underlying)(timeout).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();
-            });
+        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
-void cache_flat_mutation_reader::touch_partition() {
-    _snp->touch();
-}
-
-inline
-future<> cache_flat_mutation_reader::fill_buffer(db::timeout_clock::time_point timeout) {
+future<> cache_flat_mutation_reader::fill_buffer() {
     if (_state == state::before_static_row) {
-        auto after_static_row = [this, timeout] {
+        auto after_static_row = [this] {
             if (_ck_ranges_curr == _ck_ranges_end) {
-                touch_partition();
                 finish_reader();
                 return make_ready_future<>();
             }
@@ -224,55 +215,33 @@ future<> cache_flat_mutation_reader::fill_buffer(db::timeout_clock::time_point t
             _lsa_manager.run_in_read_section([this] {
                 move_to_range(_ck_ranges_curr);
             });
-            return fill_buffer(timeout);
+            return fill_buffer();
         };
         if (_schema->has_static_columns()) {
-            return process_static_row(timeout).then(std::move(after_static_row));
+            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, timeout] {
-        return do_fill_buffer(timeout);
+    return do_until([this] { return _end_of_stream || is_buffer_full(); }, [this] {
+        return do_fill_buffer();
     });
 }
 
 inline
-future<> cache_flat_mutation_reader::ensure_underlying(db::timeout_clock::time_point timeout) {
-    if (_underlying) {
-        return make_ready_future<>();
-    }
-    return _read_context->ensure_underlying(timeout).then([this, timeout] {
-        flat_mutation_reader& ctx_underlying = _read_context->underlying().underlying();
-        if (ctx_underlying.schema() != _schema) {
-            _underlying_holder = make_delegating_reader(ctx_underlying);
-            _underlying_holder->upgrade_schema(_schema);
-            _underlying = &*_underlying_holder;
-        } else {
-            _underlying = &ctx_underlying;
-        }
-    });
-}
-
-inline
-future<> cache_flat_mutation_reader::do_fill_buffer(db::timeout_clock::time_point timeout) {
+future<> cache_flat_mutation_reader::do_fill_buffer() {
     if (_state == state::move_to_underlying) {
-        if (!_underlying) {
-            return ensure_underlying(timeout).then([this, timeout] {
-                return do_fill_buffer(timeout);
-            });
-        }
         _state = state::reading_from_underlying;
         _population_range_starts_before_all_rows = _lower_bound.is_before_all_clustered_rows(*_schema);
         auto end = _next_row_in_range ? position_in_partition(_next_row.position())
                                       : position_in_partition(_upper_bound);
-        return _underlying->fast_forward_to(position_range{_lower_bound, std::move(end)}, timeout).then([this, timeout] {
-            return read_from_underlying(timeout);
+        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(timeout);
+        return read_from_underlying();
     }
     // assert(_state == state::reading_from_cache)
     return _lsa_manager.run_in_read_section([this] {
@@ -292,13 +261,9 @@ future<> cache_flat_mutation_reader::do_fill_buffer(db::timeout_clock::time_poin
         }
         _next_row.maybe_refresh();
         clogger.trace("csm {}: next={}, cont={}", this, _next_row.position(), _next_row.continuous());
-        _lower_bound_changed = false;
-        while (_state == state::reading_from_cache) {
+        while (!is_buffer_full() && _state == state::reading_from_cache) {
             copy_from_cache_to_buffer();
-            // We need to check _lower_bound_changed even if is_buffer_full() because
-            // we may have emitted only a range tombstone which overlapped with _lower_bound
-            // and thus didn't cause _lower_bound to change.
-            if ((need_preempt() || is_buffer_full()) && _lower_bound_changed) {
+            if (need_preempt()) {
                 break;
             }
         }
@@ -307,8 +272,8 @@ future<> cache_flat_mutation_reader::do_fill_buffer(db::timeout_clock::time_poin
 }
 
 inline
-future<> cache_flat_mutation_reader::read_from_underlying(db::timeout_clock::time_point timeout) {
-    return consume_mutation_fragments_until(*_underlying,
+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();
@@ -353,14 +318,13 @@ future<> cache_flat_mutation_reader::read_from_underlying(db::timeout_clock::tim
                                 auto inserted = insert_result.second;
                                 auto it = insert_result.first;
                                 if (inserted) {
-                                    _snp->tracker()->insert(*e);
                                     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 (ensure_population_lower_bound()) {
+                        } 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));
@@ -369,7 +333,6 @@ future<> cache_flat_mutation_reader::read_from_underlying(db::timeout_clock::tim
                                 auto inserted = insert_result.second;
                                 if (inserted) {
                                     clogger.trace("csm {}: inserted dummy at {}", this, _upper_bound);
-                                    _snp->tracker()->insert(*e);
                                     e.release();
                                 } else {
                                     clogger.trace("csm {}: mark {} as continuous", this, insert_result.first->position());
@@ -389,46 +352,30 @@ future<> cache_flat_mutation_reader::read_from_underlying(db::timeout_clock::tim
                 }
             });
             return make_ready_future<>();
-        }, timeout);
-}
-
-inline
-bool cache_flat_mutation_reader::ensure_population_lower_bound() {
-    if (_population_range_starts_before_all_rows) {
-        return true;
-    }
-    if (!_last_row.refresh(*_snp)) {
-        return false;
-    }
-    // Continuity flag we will later set for the upper bound extends to the previous row in the same version,
-    // so we need to ensure we have an entry in the latest version.
-    if (!_last_row.is_in_latest_version()) {
-        with_allocator(_snp->region().allocator(), [&] {
-            auto& rows = _snp->version()->partition().clustered_rows();
-            rows_entry::compare less(*_schema);
-            // FIXME: Avoid the copy by inserting an incomplete clustering row
-            auto e = alloc_strategy_unique_ptr<rows_entry>(
-                current_allocator().construct<rows_entry>(*_schema, *_last_row));
-            e->set_continuous(false);
-            auto insert_result = rows.insert_check(rows.end(), *e, less);
-            auto inserted = insert_result.second;
-            if (inserted) {
-                clogger.trace("csm {}: inserted lower bound dummy at {}", this, e->position());
-                _snp->tracker()->insert(*e);
-                e.release();
-            }
         });
-    }
-    return true;
 }
 
 inline
 void cache_flat_mutation_reader::maybe_update_continuity() {
-    if (can_populate() && ensure_population_lower_bound()) {
-        with_allocator(_snp->region().allocator(), [&] {
-            rows_entry& e = _next_row.ensure_entry_in_latest().row;
-            e.set_continuous(true);
-        });
+    if (can_populate() && (_population_range_starts_before_all_rows || _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();
     }
@@ -453,35 +400,32 @@ void cache_flat_mutation_reader::maybe_add_to_cache(const clustering_row& cr) {
         _read_context->cache().on_mispopulate();
         return;
     }
-    clogger.trace("csm {}: populate({})", this, clustering_row::printer(*_schema, cr));
+    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);
 
-        if (_read_context->digest_requested()) {
-            cr.cells().prepare_hash(*_schema, column_kind::regular_column);
-        }
         auto new_entry = alloc_strategy_unique_ptr<rows_entry>(
-            current_allocator().construct<rows_entry>(*_schema, cr.key(), cr.tomb(), cr.marker(), cr.cells()));
+            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) {
-            _snp->tracker()->insert(*new_entry);
+            _read_context->cache().on_row_insert();
             new_entry.release();
         }
         it = insert_result.first;
 
         rows_entry& e = *it;
-        if (ensure_population_lower_bound()) {
+        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, true);
+            _last_row = partition_snapshot_row_weakref(*_snp, it);
         });
         _population_range_starts_before_all_rows = false;
     });
@@ -496,31 +440,18 @@ 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;
-    _next_row.touch();
 }
 
 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);
-    _next_row.touch();
     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(_lower_bound, _next_row_in_range ? next_lower_bound : _upper_bound)) {
-        position_in_partition::less_compare less(*_schema);
-        // This guarantees that rts starts after any emitted clustering_row
-        // and not before any emitted range tombstone.
-        if (!less(_lower_bound, rts.position())) {
-            rts.set_start(*_schema, _lower_bound);
-        } else {
-            _lower_bound = position_in_partition(rts.position());
-            _lower_bound_changed = true;
-            if (is_buffer_full()) {
-                return;
-            }
+    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;
         }
-        push_mutation_fragment(std::move(rts));
     }
-    // We add the row to the buffer even when it's full.
-    // This simplifies the code. For more info see #3139.
     if (_next_row_in_range) {
         _last_row = _next_row;
         add_to_buffer(_next_row);
@@ -532,6 +463,7 @@ void cache_flat_mutation_reader::copy_from_cache_to_buffer() {
 
 inline
 void cache_flat_mutation_reader::move_to_end() {
+    drain_tombstones();
     finish_reader();
     clogger.trace("csm {}: eos", this);
 }
@@ -554,7 +486,6 @@ void cache_flat_mutation_reader::move_to_range(query::clustering_row_ranges::con
     _last_row = nullptr;
     _lower_bound = std::move(lb);
     _upper_bound = std::move(ub);
-    _lower_bound_changed = true;
     _ck_ranges_curr = next_it;
     auto adjacent = _next_row.advance_to(_lower_bound);
     _next_row_in_range = !after_current_range(_next_row.position());
@@ -574,8 +505,7 @@ void cache_flat_mutation_reader::move_to_range(query::clustering_row_ranges::con
                     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);
                 });
-                _snp->tracker()->insert(*it);
-                _last_row = partition_snapshot_row_weakref(*_snp, it, true);
+                _last_row = partition_snapshot_row_weakref(*_snp, it);
             } else {
                 _read_context->cache().on_mispopulate();
             }
@@ -603,9 +533,33 @@ void cache_flat_mutation_reader::move_to_next_entry() {
     }
 }
 
+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, mutation_fragment::printer(*_schema, mf));
+    clogger.trace("csm {}: add_to_buffer({})", this, mf);
     if (mf.is_clustering_row()) {
         add_clustering_row_to_buffer(std::move(mf));
     } else {
@@ -618,7 +572,7 @@ 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(_read_context->digest_requested()));
+        add_clustering_row_to_buffer(row.row());
     }
 }
 
@@ -627,30 +581,30 @@ void cache_flat_mutation_reader::add_to_buffer(const partition_snapshot_row_curs
 //   (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, mutation_fragment::printer(*_schema, mf));
+    clogger.trace("csm {}: add_clustering_row_to_buffer({})", this, mf);
     auto& row = mf.as_clustering_row();
-    auto new_lower_bound = position_in_partition::after_key(row.key());
-    push_mutation_fragment(std::move(mf));
-    _lower_bound = std::move(new_lower_bound);
-    _lower_bound_changed = true;
+    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
-    // and not before any emitted range tombstone.
-    position_in_partition::less_compare less(*_schema);
-    if (!less(_lower_bound, rt.end_position())) {
+    if (!rt.trim_front(*_schema, _lower_bound)) {
         return;
     }
-    if (!less(_lower_bound, rt.position())) {
-        rt.set_start(*_schema, _lower_bound);
-    } else {
-        _lower_bound = position_in_partition(rt.position());
-        _lower_bound_changed = true;
-    }
-    push_mutation_fragment(std::move(rt));
+    _lower_bound = position_in_partition(rt.position());
+    _tombstones.apply(std::move(rt));
+    drain_tombstones(_lower_bound);
 }
 
 inline
@@ -668,12 +622,9 @@ void cache_flat_mutation_reader::maybe_add_to_cache(const range_tombstone& rt) {
 inline
 void cache_flat_mutation_reader::maybe_add_to_cache(const static_row& sr) {
     if (can_populate()) {
-        clogger.trace("csm {}: populate({})", this, static_row::printer(*_schema, sr));
-        _read_context->cache().on_static_row_insert();
+        clogger.trace("csm {}: populate({})", this, sr);
+        _read_context->cache().on_row_insert();
         _lsa_manager.run_in_update_section_with_allocator([&] {
-            if (_read_context->digest_requested()) {
-                sr.cells().prepare_hash(*_schema, column_kind::static_column);
-            }
             _snp->version()->partition().static_row().apply(*_schema, column_kind::static_column, sr.cells());
         });
     } else {
@@ -703,7 +654,7 @@ inline flat_mutation_reader make_cache_flat_mutation_reader(schema_ptr s,
                                                             query::clustering_key_filter_ranges crr,
                                                             row_cache& cache,
                                                             lw_shared_ptr<cache::read_context> ctx,
-                                                            partition_snapshot_ptr snp)
+                                                            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);

cache_temperature.hh

@@ -1,45 +0,0 @@
-/*
- * Copyright 2018 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 <stdint.h>
-
-namespace ser {
-
-template <typename T>
-class serializer;
-
-};
-
-class cache_temperature {
-    float hit_rate;
-    explicit cache_temperature(uint8_t hr) : hit_rate(hr/255.0f) {}
-public:
-    uint8_t get_serialized_temperature() const {
-        return hit_rate * 255;
-    }
-    cache_temperature() : hit_rate(0) {}
-    explicit cache_temperature(float hr) : hit_rate(hr) {}
-    explicit operator float() const { return hit_rate; }
-    static cache_temperature invalid() { return cache_temperature(-1.0f); }
-    friend struct ser::serializer<cache_temperature>;
-};

caching_options.hh

@@ -20,7 +20,7 @@
  */
 
 #pragma once
-#include <seastar/core/sstring.hh>
+#include <core/sstring.hh>
 #include <boost/lexical_cast.hpp>
 #include "exceptions/exceptions.hh"
 #include "json.hh"

canonical_mutation.cc

@@ -68,14 +68,14 @@ mutation canonical_mutation::to_mutation(schema_ptr s) const {
 
     auto cf_id = mv.table_id();
     if (s->id() != cf_id) {
-        throw std::runtime_error(format("Attempted to deserialize canonical_mutation of table {} with schema of table {} ({}.{})",
+        throw std::runtime_error(sprint("Attempted to deserialize canonical_mutation of table %s with schema of table %s (%s.%s)",
                                         cf_id, s->id(), s->ks_name(), s->cf_name()));
     }
 
     auto version = mv.schema_version();
     auto pk = mv.key();
 
-    mutation m(std::move(s), std::move(pk));
+    mutation m(std::move(pk), std::move(s));
 
     if (version == m.schema()->version()) {
         auto partition_view = mutation_partition_view::from_view(mv.partition());

cell_locking.hh

@@ -23,15 +23,27 @@
 
 #include <boost/intrusive/unordered_set.hpp>
 
-#include "utils/small_vector.hh"
-#include "mutation_fragment.hh"
-#include "mutation_partition.hh"
-#include "xx_hasher.hh"
+#if __has_include(<boost/container/small_vector.hpp>)
 
-#include "db/timeout_clock.hh"
+#include <boost/container/small_vector.hpp>
+
+template <typename T, size_t N>
+using small_vector = boost::container::small_vector<T, N>;
+
+#else
+
+#include <vector>
+template <typename T, size_t N>
+using small_vector = std::vector<T>;
+
+#endif
+
+#include "fnv1a_hasher.hh"
+#include "streamed_mutation.hh"
+#include "mutation_partition.hh"
 
 class cells_range {
-    using ids_vector_type = utils::small_vector<column_id, 5>;
+    using ids_vector_type = small_vector<column_id, 5>;
 
     position_in_partition_view _position;
     ids_vector_type _ids;
@@ -63,7 +75,7 @@ class partition_cells_range {
 public:
     class iterator {
         const mutation_partition& _mp;
-        std::optional<mutation_partition::rows_type::const_iterator> _position;
+        stdx::optional<mutation_partition::rows_type::const_iterator> _position;
         cells_range _current;
     public:
         explicit iterator(const mutation_partition& mp)
@@ -130,7 +142,11 @@ struct cell_locker_stats {
 };
 
 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 {
@@ -142,7 +158,7 @@ private:
                        public enable_lw_shared_from_this<cell_entry> {
         partition_entry& _parent;
         cell_address _address;
-        db::timeout_semaphore _semaphore { 0 };
+        semaphore_type _semaphore { 0 };
 
         friend class cell_locker;
     public:
@@ -171,7 +187,7 @@ private:
             return _address.position;
         }
 
-        future<> lock(db::timeout_clock::time_point _timeout) {
+        future<> lock(timeout_clock::time_point _timeout) {
             return _semaphore.wait(_timeout);
         }
         void unlock() {
@@ -194,10 +210,10 @@ private:
             explicit hasher(const schema& s) : _schema(&s) { }
 
             size_t operator()(const cell_address& ca) const {
-                xx_hasher hasher;
+                fnv1a_hasher hasher;
                 ca.position.feed_hash(hasher, *_schema);
                 ::feed_hash(hasher, ca.id);
-                return static_cast<size_t>(hasher.finalize_uint64());
+                return hasher.finalize();
             }
             size_t operator()(const cell_entry& ce) const {
                 return operator()(ce._address);
@@ -371,7 +387,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,
-                                                db::timeout_clock::time_point timeout);
+                                                timeout_clock::time_point timeout);
 };
 
 
@@ -400,7 +416,7 @@ struct cell_locker::locker {
     partition_cells_range::iterator _current_ck;
     cells_range::const_iterator _current_cell;
 
-    db::timeout_clock::time_point _timeout;
+    timeout_clock::time_point _timeout;
     std::vector<locked_cell> _locks;
     cell_locker_stats& _stats;
 private:
@@ -414,7 +430,7 @@ 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, db::timeout_clock::time_point timeout)
+    explicit locker(const ::schema& s, cell_locker_stats& st, partition_entry& pe, partition_cells_range&& range, timeout_clock::time_point timeout)
         : _hasher(s)
         , _eq_cmp(s)
         , _partition_entry(pe)
@@ -442,7 +458,7 @@ public:
 };
 
 inline
-future<std::vector<locked_cell>> cell_locker::lock_cells(const dht::decorated_key& dk, partition_cells_range&& range, db::timeout_clock::time_point timeout) {
+future<std::vector<locked_cell>> cell_locker::lock_cells(const dht::decorated_key& dk, partition_cells_range&& range, timeout_clock::time_point timeout) {
     partition_entry::hasher pe_hash;
     partition_entry::equal_compare pe_eq(*_schema);
 

clustering_bounds_comparator.hh

@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include <functional>
 #include "keys.hh"
 #include "schema.hh"
 #include "range.hh"
@@ -44,20 +43,22 @@ bound_kind invert_kind(bound_kind k);
 int32_t weight(bound_kind k);
 
 class bound_view {
-    const static thread_local clustering_key _empty_prefix;
-    std::reference_wrapper<const clustering_key_prefix> _prefix;
-    bound_kind _kind;
 public:
+    const static thread_local clustering_key empty_prefix;
+    const clustering_key_prefix& prefix;
+    bound_kind kind;
     bound_view(const clustering_key_prefix& prefix, bound_kind kind)
-        : _prefix(prefix)
-        , _kind(kind)
+        : prefix(prefix)
+        , kind(kind)
     { }
     bound_view(const bound_view& other) noexcept = default;
-    bound_view& operator=(const bound_view& other) noexcept = default;
-
-    bound_kind kind() const { return _kind; }
-    const clustering_key_prefix& prefix() const { return _prefix; }
-
+    bound_view& operator=(const bound_view& other) noexcept {
+        if (this != &other) {
+            this->~bound_view();
+            new (this) bound_view(other);
+        }
+        return *this;
+    }
     struct tri_compare {
         // To make it assignable and to avoid taking a schema_ptr, we
         // wrap the schema reference.
@@ -81,13 +82,13 @@ public:
             return d1 < d2 ? w1 - (w1 <= 0) : -(w2 - (w2 <= 0));
         }
         int operator()(const bound_view b, const clustering_key_prefix& p) const {
-            return operator()(b._prefix, weight(b._kind), p, 0);
+            return operator()(b.prefix, weight(b.kind), p, 0);
         }
         int operator()(const clustering_key_prefix& p, const bound_view b) const {
-            return operator()(p, 0, b._prefix, weight(b._kind));
+            return operator()(p, 0, b.prefix, weight(b.kind));
         }
         int operator()(const bound_view b1, const bound_view b2) const {
-            return operator()(b1._prefix, weight(b1._kind), b2._prefix, weight(b2._kind));
+            return operator()(b1.prefix, weight(b1.kind), b2.prefix, weight(b2.kind));
         }
     };
     struct compare {
@@ -100,26 +101,26 @@ public:
             return _cmp(p1, w1, p2, w2) < 0;
         }
         bool operator()(const bound_view b, const clustering_key_prefix& p) const {
-            return operator()(b._prefix, weight(b._kind), p, 0);
+            return operator()(b.prefix, weight(b.kind), p, 0);
         }
         bool operator()(const clustering_key_prefix& p, const bound_view b) const {
-            return operator()(p, 0, b._prefix, weight(b._kind));
+            return operator()(p, 0, b.prefix, weight(b.kind));
         }
         bool operator()(const bound_view b1, const bound_view b2) const {
-            return operator()(b1._prefix, weight(b1._kind), b2._prefix, weight(b2._kind));
+            return operator()(b1.prefix, weight(b1.kind), b2.prefix, weight(b2.kind));
         }
     };
     bool equal(const schema& s, const bound_view other) const {
-        return _kind == other._kind && _prefix.get().equal(s, other._prefix.get());
+        return kind == other.kind && prefix.equal(s, other.prefix);
     }
     bool adjacent(const schema& s, const bound_view other) const {
-        return invert_kind(other._kind) == _kind && _prefix.get().equal(s, other._prefix.get());
+        return invert_kind(other.kind) == kind && prefix.equal(s, other.prefix);
     }
     static bound_view bottom() {
-        return {_empty_prefix, bound_kind::incl_start};
+        return {empty_prefix, bound_kind::incl_start};
     }
     static bound_view top() {
-        return {_empty_prefix, bound_kind::incl_end};
+        return {empty_prefix, bound_kind::incl_end};
     }
     template<template<typename> typename R>
     GCC6_CONCEPT( requires Range<R, clustering_key_prefix_view> )
@@ -142,14 +143,14 @@ public:
     }
     template<template<typename> typename R>
     GCC6_CONCEPT( requires Range<R, clustering_key_prefix_view> )
-    static std::optional<typename R<clustering_key_prefix_view>::bound> to_range_bound(const bound_view& bv) {
-        if (&bv._prefix.get() == &_empty_prefix) {
+    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.get().view(), inclusive)};
+        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)};
     }
     friend std::ostream& operator<<(std::ostream& out, const bound_view& b) {
-        return out << "{bound: prefix=" << b._prefix.get() << ", kind=" << b._kind << "}";
+        return out << "{bound: prefix=" << b.prefix << ", kind=" << b.kind << "}";
     }
 };

clustering_key_filter.hh

@@ -30,7 +30,7 @@ namespace query {
 
 class clustering_key_filter_ranges {
     clustering_row_ranges _storage;
-    std::reference_wrapper<const clustering_row_ranges> _ref;
+    const clustering_row_ranges& _ref;
 public:
     clustering_key_filter_ranges(const clustering_row_ranges& ranges) : _ref(ranges) { }
     struct reversed { };
@@ -39,21 +39,21 @@ public:
 
     clustering_key_filter_ranges(clustering_key_filter_ranges&& other) noexcept
         : _storage(std::move(other._storage))
-        , _ref(&other._ref.get() == &other._storage ? _storage : other._ref.get())
+        , _ref(&other._ref == &other._storage ? _storage : other._ref)
     { }
 
     clustering_key_filter_ranges& operator=(clustering_key_filter_ranges&& other) noexcept {
         if (this != &other) {
-            _storage = std::move(other._storage);
-            _ref = (&other._ref.get() == &other._storage) ? _storage : other._ref.get();
+            this->~clustering_key_filter_ranges();
+            new (this) clustering_key_filter_ranges(std::move(other));
         }
         return *this;
     }
 
-    auto begin() const { return _ref.get().begin(); }
-    auto end() const { return _ref.get().end(); }
-    bool empty() const { return _ref.get().empty(); }
-    size_t size() const { return _ref.get().size(); }
+    auto begin() const { return _ref.begin(); }
+    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) {

clustering_ranges_walker.hh

@@ -25,67 +25,78 @@
 
 #include "schema.hh"
 #include "query-request.hh"
-#include "mutation_fragment.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;
-    boost::iterator_range<query::clustering_row_ranges::const_iterator> _current_range;
+    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;
-    std::optional<position_in_partition> _trim;
+    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_range) {
+            if (_current == _end) {
                 return false;
             }
-            _current_range.advance_begin(1);
+            ++_current;
         }
         ++_change_counter;
-        if (!_current_range) {
+        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_range.front());
-        _current_end = position_in_partition_view::for_range_end(_current_range.front());
+        _current_start = position_in_partition_view::for_range_start(*_current);
+        _current_end = position_in_partition_view::for_range_end(*_current);
         return true;
     }
-
-    void set_current_positions() {
-         if (!_with_static_row) {
-            if (!_current_range) {
+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_range.front());
-                _current_end = position_in_partition_view::for_range_end(_current_range.front());
+                _current_start = position_in_partition_view::for_range_start(*_current);
+                _current_end = position_in_partition_view::for_range_end(*_current);
             }
         }
     }
-
-public:
-    clustering_ranges_walker(const schema& s, const query::clustering_row_ranges& ranges, bool with_static_row = true)
-            : _schema(s)
-            , _ranges(ranges)
-            , _current_range(ranges)
-            , _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()) {
-        set_current_positions();
+    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;
     }
 
-    clustering_ranges_walker(const clustering_ranges_walker&) = delete;
-    clustering_ranges_walker(clustering_ranges_walker&&) = delete;
-
-    clustering_ranges_walker& operator=(const clustering_ranges_walker&) = delete;
-    clustering_ranges_walker& operator=(clustering_ranges_walker&&) = delete;
-
     // Excludes positions smaller than pos from the ranges.
     // pos should be monotonic.
     // No constraints between pos and positions passed to advance_to().
@@ -162,15 +173,17 @@ public:
             return false;
         }
 
-        for (const auto& rng : _current_range) {
-            auto range_start = position_in_partition_view::for_range_start(rng);
+        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(rng);
+            auto range_end = position_in_partition_view::for_range_end(*i);
             if (less(start, range_end)) {
                 return true;
             }
+            ++i;
         }
 
         return false;
@@ -178,20 +191,18 @@ public:
 
     // 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_range;
+        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() {
-        _current_range = _ranges;
-        _in_current = _with_static_row;
-        _current_start = position_in_partition_view::for_static_row();
-        _current_end = position_in_partition_view::before_all_clustered_rows();
-        set_current_positions();
-        ++_change_counter;
-        if (_trim) {
-            trim_front(*std::exchange(_trim, {}));
+        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));
         }
     }
 
@@ -200,11 +211,6 @@ public:
         return _current_start;
     }
 
-    // Returns the upper bound of the last range in provided ranges set
-    position_in_partition_view uppermost_bound() const {
-        return position_in_partition_view::for_range_end(_ranges.back());
-    }
-
     // When lower_bound() changes, this also does
     // Always > 0.
     size_t lower_bound_change_counter() const {

compaction_strategy.hh

@@ -23,10 +23,8 @@
 
 #include "sstables/shared_sstable.hh"
 #include "exceptions/exceptions.hh"
-#include "sstables/compaction_backlog_manager.hh"
 
-class table;
-using column_family = table;
+class column_family;
 class schema;
 using schema_ptr = lw_shared_ptr<const schema>;
 
@@ -61,8 +59,6 @@ public:
     // 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);
 
-    compaction_descriptor get_major_compaction_job(column_family& cf, std::vector<shared_sstable> candidates);
-
     std::vector<resharding_descriptor> get_resharding_jobs(column_family& cf, std::vector<shared_sstable> candidates);
 
     // Some strategies may look at the compacted and resulting sstables to
@@ -75,9 +71,6 @@ public:
     // Return if optimization to rule out sstables based on clustering key filter should be applied.
     bool use_clustering_key_filter() const;
 
-    // Return true if compaction strategy ignores sstables coming from partial runs.
-    bool ignore_partial_runs() const;
-
     // An estimation of number of compaction for strategy to be satisfied.
     int64_t estimated_pending_compactions(column_family& cf) const;
 
@@ -116,7 +109,7 @@ public:
         } else if (short_name == "TimeWindowCompactionStrategy") {
             return compaction_strategy_type::time_window;
         } else {
-            throw exceptions::configuration_exception(format("Unable to find compaction strategy class '{}'", name));
+            throw exceptions::configuration_exception(sprint("Unable to find compaction strategy class '%s'", name));
         }
     }
 
@@ -127,8 +120,6 @@ public:
     }
 
     sstable_set make_sstable_set(schema_ptr schema) const;
-
-    compaction_backlog_tracker& get_backlog_tracker();
 };
 
 // Creates a compaction_strategy object from one of the strategies available.

compatible_ring_position.hh

@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2016 ScyllaDB
+ */
+
+/*
+ * This file is part of Scylla.
+ *
+ * Scylla is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Scylla is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#pragma once
+
+#include "query-request.hh"
+#include <experimental/optional>
+
+// Wraps ring_position so it is compatible with old-style C++: default constructor,
+// stateless comparators, yada yada
+class compatible_ring_position {
+    const schema* _schema = nullptr;
+    // optional to supply a default constructor, no more
+    std::experimental::optional<dht::ring_position> _rp;
+public:
+    compatible_ring_position() noexcept = default;
+    compatible_ring_position(const schema& s, const dht::ring_position& rp)
+            : _schema(&s), _rp(rp) {
+    }
+    compatible_ring_position(const schema& s, dht::ring_position&& rp)
+            : _schema(&s), _rp(std::move(rp)) {
+    }
+    const dht::token& token() const {
+        return _rp->token();
+    }
+    friend int tri_compare(const compatible_ring_position& x, const compatible_ring_position& y) {
+        return x._rp->tri_compare(*x._schema, *y._rp);
+    }
+    friend bool operator<(const compatible_ring_position& x, const compatible_ring_position& y) {
+        return tri_compare(x, y) < 0;
+    }
+    friend bool operator<=(const compatible_ring_position& x, const compatible_ring_position& y) {
+        return tri_compare(x, y) <= 0;
+    }
+    friend bool operator>(const compatible_ring_position& x, const compatible_ring_position& y) {
+        return tri_compare(x, y) > 0;
+    }
+    friend bool operator>=(const compatible_ring_position& x, const compatible_ring_position& y) {
+        return tri_compare(x, y) >= 0;
+    }
+    friend bool operator==(const compatible_ring_position& x, const compatible_ring_position& y) {
+        return tri_compare(x, y) == 0;
+    }
+    friend bool operator!=(const compatible_ring_position& x, const compatible_ring_position& y) {
+        return tri_compare(x, y) != 0;
+    }
+};
+

compatible_ring_position_view.hh

@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2016 ScyllaDB
- */
-
-/*
- * This file is part of Scylla.
- *
- * Scylla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Scylla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#pragma once
-
-#include "query-request.hh"
-#include <optional>
-
-// Wraps ring_position_view so it is compatible with old-style C++: default
-// constructor, stateless comparators, yada yada.
-class compatible_ring_position_view {
-    const schema* _schema = nullptr;
-    // Optional to supply a default constructor, no more.
-    std::optional<dht::ring_position_view> _rpv;
-public:
-    constexpr compatible_ring_position_view() = default;
-    compatible_ring_position_view(const schema& s, dht::ring_position_view rpv)
-        : _schema(&s), _rpv(rpv) {
-    }
-    const dht::ring_position_view& position() const {
-        return *_rpv;
-    }
-    friend int tri_compare(const compatible_ring_position_view& x, const compatible_ring_position_view& y) {
-        return dht::ring_position_tri_compare(*x._schema, *x._rpv, *y._rpv);
-    }
-    friend bool operator<(const compatible_ring_position_view& x, const compatible_ring_position_view& y) {
-        return tri_compare(x, y) < 0;
-    }
-    friend bool operator<=(const compatible_ring_position_view& x, const compatible_ring_position_view& y) {
-        return tri_compare(x, y) <= 0;
-    }
-    friend bool operator>(const compatible_ring_position_view& x, const compatible_ring_position_view& y) {
-        return tri_compare(x, y) > 0;
-    }
-    friend bool operator>=(const compatible_ring_position_view& x, const compatible_ring_position_view& y) {
-        return tri_compare(x, y) >= 0;
-    }
-    friend bool operator==(const compatible_ring_position_view& x, const compatible_ring_position_view& y) {
-        return tri_compare(x, y) == 0;
-    }
-    friend bool operator!=(const compatible_ring_position_view& x, const compatible_ring_position_view& y) {
-        return tri_compare(x, y) != 0;
-    }
-};
-

compound.hh

@@ -28,7 +28,6 @@
 #include <boost/range/iterator_range.hpp>
 #include <boost/range/adaptor/transformed.hpp>
 #include "utils/serialization.hh"
-#include <seastar/util/backtrace.hh>
 #include "unimplemented.hh"
 
 enum class allow_prefixes { no, yes };
@@ -98,7 +97,7 @@ public:
     static bytes serialize_value(RangeOfSerializedComponents&& values) {
         auto size = serialized_size(values);
         if (size > std::numeric_limits<size_type>::max()) {
-            throw std::runtime_error(format("Key size too large: {:d} > {:d}", size, std::numeric_limits<size_type>::max()));
+            throw std::runtime_error(sprint("Key size too large: %d > %d", size, std::numeric_limits<size_type>::max()));
         }
         bytes b(bytes::initialized_later(), size);
         auto i = b.begin();
@@ -145,7 +144,7 @@ public:
                 }
                 len = read_simple<size_type>(_v);
                 if (_v.size() < len) {
-                    throw_with_backtrace<marshal_exception>(format("compound_type iterator - not enough bytes, expected {:d}, got {:d}", len, _v.size()));
+                    throw marshal_exception();
                 }
             }
             _current = bytes_view(_v.begin(), len);

compound_compat.hh

@@ -25,7 +25,6 @@
 #include <boost/range/adaptor/transformed.hpp>
 #include "compound.hh"
 #include "schema.hh"
-#include "sstables/version.hh"
 
 //
 // This header provides adaptors between the representation used by our compound_type<>
@@ -284,7 +283,7 @@ private:
             // bytes is the static prefix or not).
             auto value_size = size(*it);
             if (value_size > static_cast<size_type>(std::numeric_limits<size_type>::max() - uint8_t(is_compound))) {
-                throw std::runtime_error(format("First component size too large: {:d} > {:d}", value_size, std::numeric_limits<size_type>::max() - is_compound));
+                throw std::runtime_error(sprint("First component size too large: %d > %d", value_size, std::numeric_limits<size_type>::max() - is_compound));
             }
             if (!is_compound) {
                 return value_size;
@@ -295,7 +294,7 @@ private:
         for ( ; it != values.end(); ++it) {
             auto value_size = size(*it);
             if (value_size > std::numeric_limits<size_type>::max()) {
-                throw std::runtime_error(format("Component size too large: {:d} > {:d}", value_size, std::numeric_limits<size_type>::max()));
+                throw std::runtime_error(sprint("Component size too large: %d > %d", value_size, std::numeric_limits<size_type>::max()));
             }
             len += sizeof(size_type) + value_size + sizeof(eoc_type);
         }
@@ -303,7 +302,7 @@ private:
     }
 public:
     template <typename Describer>
-    auto describe_type(sstables::sstable_version_types v, Describer f) const {
+    auto describe_type(Describer f) const {
         return f(const_cast<bytes&>(_bytes));
     }
 
@@ -346,7 +345,7 @@ public:
                 }
                 len = read_simple<size_type>(_v);
                 if (_v.size() < len) {
-                    throw_with_backtrace<marshal_exception>(format("composite iterator - not enough bytes, expected {:d}, got {:d}", len, _v.size()));
+                    throw marshal_exception();
                 }
             }
             auto value = bytes_view(_v.begin(), len);
@@ -468,7 +467,7 @@ public:
 
     template <typename Component>
     friend inline std::ostream& operator<<(std::ostream& os, const std::pair<Component, eoc>& c) {
-        return os << "{value=" << c.first << "; eoc=" << format("0x{:02x}", eoc_type(c.second) & 0xff) << "}";
+        return os << "{value=" << c.first << "; eoc=" << sprint("0x%02x", eoc_type(c.second) & 0xff) << "}";
     }
 
     friend std::ostream& operator<<(std::ostream& os, const composite& v);
@@ -511,7 +510,7 @@ public:
             auto marker = it->second;
             ++it;
             if (it != e && marker != composite::eoc::none) {
-                throw runtime_exception(format("non-zero component divider found ({:d}) mid", format("0x{:02x}", composite::eoc_type(marker) & 0xff)));
+                throw runtime_exception(sprint("non-zero component divider found (%d) mid", sprint("0x%02x", composite::eoc_type(marker) & 0xff)));
             }
         }
         return ret;

compress.cc

@@ -1,351 +0,0 @@
-/*
- * Copyright (C) 2016 ScyllaDB
- */
-
-/*
- * This file is part of Scylla.
- *
- * Scylla is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Scylla is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <lz4.h>
-#include <zlib.h>
-#include <snappy-c.h>
-
-#include "compress.hh"
-#include "utils/class_registrator.hh"
-
-const sstring compressor::namespace_prefix = "org.apache.cassandra.io.compress.";
-
-class lz4_processor: public compressor {
-public:
-    using compressor::compressor;
-
-    size_t uncompress(const char* input, size_t input_len, char* output,
-                    size_t output_len) const override;
-    size_t compress(const char* input, size_t input_len, char* output,
-                    size_t output_len) const override;
-    size_t compress_max_size(size_t input_len) const override;
-};
-
-class snappy_processor: public compressor {
-public:
-    using compressor::compressor;
-
-    size_t uncompress(const char* input, size_t input_len, char* output,
-                    size_t output_len) const override;
-    size_t compress(const char* input, size_t input_len, char* output,
-                    size_t output_len) const override;
-    size_t compress_max_size(size_t input_len) const override;
-};
-
-class deflate_processor: public compressor {
-public:
-    using compressor::compressor;
-
-    size_t uncompress(const char* input, size_t input_len, char* output,
-                    size_t output_len) const override;
-    size_t compress(const char* input, size_t input_len, char* output,
-                    size_t output_len) const override;
-    size_t compress_max_size(size_t input_len) const override;
-};
-
-compressor::compressor(sstring name)
-    : _name(std::move(name))
-{}
-
-std::set<sstring> compressor::option_names() const {
-    return {};
-}
-
-std::map<sstring, sstring> compressor::options() const {
-    return {};
-}
-
-shared_ptr<compressor> compressor::create(const sstring& name, const opt_getter& opts) {
-    if (name.empty()) {
-        return {};
-    }
-
-    qualified_name qn(namespace_prefix, name);
-
-    for (auto& c : { lz4, snappy, deflate }) {
-        if (c->name() == qn) {
-            return c;
-        }
-    }
-
-    return compressor_registry::create(qn, opts);
-}
-
-shared_ptr<compressor> compressor::create(const std::map<sstring, sstring>& options) {
-    auto i = options.find(compression_parameters::SSTABLE_COMPRESSION);
-    if (i != options.end() && !i->second.empty()) {
-        return create(i->second, [&options](const sstring& key) -> opt_string {
-            auto i = options.find(key);
-            if (i == options.end()) {
-                return std::nullopt;
-            }
-            return { i->second };
-        });
-    }
-    return {};
-}
-
-thread_local const shared_ptr<compressor> compressor::lz4 = make_shared<lz4_processor>(namespace_prefix + "LZ4Compressor");
-thread_local const shared_ptr<compressor> compressor::snappy = make_shared<snappy_processor>(namespace_prefix + "SnappyCompressor");
-thread_local const shared_ptr<compressor> compressor::deflate = make_shared<deflate_processor>(namespace_prefix + "DeflateCompressor");
-
-const sstring compression_parameters::SSTABLE_COMPRESSION = "sstable_compression";
-const sstring compression_parameters::CHUNK_LENGTH_KB = "chunk_length_in_kb";
-const sstring compression_parameters::CHUNK_LENGTH_KB_ERR = "chunk_length_kb";
-const sstring compression_parameters::CRC_CHECK_CHANCE = "crc_check_chance";
-
-compression_parameters::compression_parameters()
-    : compression_parameters(compressor::lz4)
-{}
-
-compression_parameters::~compression_parameters()
-{}
-
-compression_parameters::compression_parameters(compressor_ptr c)
-    : _compressor(std::move(c))
-{}
-
-compression_parameters::compression_parameters(const std::map<sstring, sstring>& options) {
-    _compressor = compressor::create(options);
-
-    validate_options(options);
-
-    auto chunk_length = options.find(CHUNK_LENGTH_KB) != options.end() ?
-        options.find(CHUNK_LENGTH_KB) : options.find(CHUNK_LENGTH_KB_ERR);
-
-    if (chunk_length != options.end()) {
-        try {
-            _chunk_length = std::stoi(chunk_length->second) * 1024;
-        } catch (const std::exception& e) {
-            throw exceptions::syntax_exception(sstring("Invalid integer value ") + chunk_length->second + " for " + chunk_length->first);
-        }
-    }
-    auto crc_chance = options.find(CRC_CHECK_CHANCE);
-    if (crc_chance != options.end()) {
-        try {
-            _crc_check_chance = std::stod(crc_chance->second);
-        } catch (const std::exception& e) {
-            throw exceptions::syntax_exception(sstring("Invalid double value ") + crc_chance->second + "for " + CRC_CHECK_CHANCE);
-        }
-    }
-}
-
-void compression_parameters::validate() {
-    if (_chunk_length) {
-        auto chunk_length = _chunk_length.value();
-        if (chunk_length <= 0) {
-            throw exceptions::configuration_exception(
-                fmt::sprintf("Invalid negative or null for %s/%s", CHUNK_LENGTH_KB, CHUNK_LENGTH_KB_ERR));
-        }
-        // _chunk_length must be a power of two
-        if (chunk_length & (chunk_length - 1)) {
-            throw exceptions::configuration_exception(
-                fmt::sprintf("%s/%s must be a power of 2.", CHUNK_LENGTH_KB, CHUNK_LENGTH_KB_ERR));
-        }
-    }
-    if (_crc_check_chance && (_crc_check_chance.value() < 0.0 || _crc_check_chance.value() > 1.0)) {
-        throw exceptions::configuration_exception(sstring(CRC_CHECK_CHANCE) + " must be between 0.0 and 1.0.");
-    }
-}
-
-std::map<sstring, sstring> compression_parameters::get_options() const {
-    if (!_compressor) {
-        return std::map<sstring, sstring>();
-    }
-    auto opts = _compressor->options();
-
-    opts.emplace(compression_parameters::SSTABLE_COMPRESSION, _compressor->name());
-    if (_chunk_length) {
-        opts.emplace(sstring(CHUNK_LENGTH_KB), std::to_string(_chunk_length.value() / 1024));
-    }
-    if (_crc_check_chance) {
-        opts.emplace(sstring(CRC_CHECK_CHANCE), std::to_string(_crc_check_chance.value()));
-    }
-    return opts;
-}
-
-bool compression_parameters::operator==(const compression_parameters& other) const {
-    return _compressor == other._compressor
-           && _chunk_length == other._chunk_length
-           && _crc_check_chance == other._crc_check_chance;
-}
-
-bool compression_parameters::operator!=(const compression_parameters& other) const {
-    return !(*this == other);
-}
-
-void compression_parameters::validate_options(const std::map<sstring, sstring>& options) {
-    // currently, there are no options specific to a particular compressor
-    static std::set<sstring> keywords({
-        sstring(SSTABLE_COMPRESSION),
-        sstring(CHUNK_LENGTH_KB),
-        sstring(CHUNK_LENGTH_KB_ERR),
-        sstring(CRC_CHECK_CHANCE),
-    });
-    std::set<sstring> ckw;
-    if (_compressor) {
-        ckw = _compressor->option_names();
-    }
-    for (auto&& opt : options) {
-        if (!keywords.count(opt.first) && !ckw.count(opt.first)) {
-            throw exceptions::configuration_exception(format("Unknown compression option '{}'.", opt.first));
-        }
-    }
-}
-
-size_t lz4_processor::uncompress(const char* input, size_t input_len,
-                char* output, size_t output_len) const {
-    // We use LZ4_decompress_safe(). According to the documentation, the
-    // function LZ4_decompress_fast() is slightly faster, but maliciously
-    // crafted compressed data can cause it to overflow the output buffer.
-    // Theoretically, our compressed data is created by us so is not malicious
-    // (and accidental corruption is avoided by the compressed-data checksum),
-    // but let's not take that chance for now, until we've actually measured
-    // the performance benefit that LZ4_decompress_fast() would bring.
-
-    // Cassandra's LZ4Compressor prepends to the chunk its uncompressed length
-    // in 4 bytes little-endian (!) order. We don't need this information -
-    // we already know the uncompressed data is at most the given chunk size
-    // (and usually is exactly that, except in the last chunk). The advance
-    // knowledge of the uncompressed size could be useful if we used
-    // LZ4_decompress_fast(), but we prefer LZ4_decompress_safe() anyway...
-    input += 4;
-    input_len -= 4;
-
-    auto ret = LZ4_decompress_safe(input, output, input_len, output_len);
-    if (ret < 0) {
-        throw std::runtime_error("LZ4 uncompression failure");
-    }
-    return ret;
-}
-
-size_t lz4_processor::compress(const char* input, size_t input_len,
-                char* output, size_t output_len) const {
-    if (output_len < LZ4_COMPRESSBOUND(input_len) + 4) {
-        throw std::runtime_error("LZ4 compression failure: length of output is too small");
-    }
-    // Write input_len (32-bit data) to beginning of output in little-endian representation.
-    output[0] = input_len & 0xFF;
-    output[1] = (input_len >> 8) & 0xFF;
-    output[2] = (input_len >> 16) & 0xFF;
-    output[3] = (input_len >> 24) & 0xFF;
-#ifdef HAVE_LZ4_COMPRESS_DEFAULT
-    auto ret = LZ4_compress_default(input, output + 4, input_len, LZ4_compressBound(input_len));
-#else
-    auto ret = LZ4_compress(input, output + 4, input_len);
-#endif
-    if (ret == 0) {
-        throw std::runtime_error("LZ4 compression failure: LZ4_compress() failed");
-    }
-    return ret + 4;
-}
-
-size_t lz4_processor::compress_max_size(size_t input_len) const {
-    return LZ4_COMPRESSBOUND(input_len) + 4;
-}
-
-size_t deflate_processor::uncompress(const char* input,
-                size_t input_len, char* output, size_t output_len) const {
-    z_stream zs;
-    zs.zalloc = Z_NULL;
-    zs.zfree = Z_NULL;
-    zs.opaque = Z_NULL;
-    zs.avail_in = 0;
-    zs.next_in = Z_NULL;
-    if (inflateInit(&zs) != Z_OK) {
-        throw std::runtime_error("deflate uncompression init failure");
-    }
-    // yuck, zlib is not const-correct, and also uses unsigned char while we use char :-(
-    zs.next_in = reinterpret_cast<unsigned char*>(const_cast<char*>(input));
-    zs.avail_in = input_len;
-    zs.next_out = reinterpret_cast<unsigned char*>(output);
-    zs.avail_out = output_len;
-    auto res = inflate(&zs, Z_FINISH);
-    inflateEnd(&zs);
-    if (res == Z_STREAM_END) {
-        return output_len - zs.avail_out;
-    } else {
-        throw std::runtime_error("deflate uncompression failure");
-    }
-}
-
-size_t deflate_processor::compress(const char* input,
-                size_t input_len, char* output, size_t output_len) const {
-    z_stream zs;
-    zs.zalloc = Z_NULL;
-    zs.zfree = Z_NULL;
-    zs.opaque = Z_NULL;
-    zs.avail_in = 0;
-    zs.next_in = Z_NULL;
-    if (deflateInit(&zs, Z_DEFAULT_COMPRESSION) != Z_OK) {
-        throw std::runtime_error("deflate compression init failure");
-    }
-    zs.next_in = reinterpret_cast<unsigned char*>(const_cast<char*>(input));
-    zs.avail_in = input_len;
-    zs.next_out = reinterpret_cast<unsigned char*>(output);
-    zs.avail_out = output_len;
-    auto res = ::deflate(&zs, Z_FINISH);
-    deflateEnd(&zs);
-    if (res == Z_STREAM_END) {
-        return output_len - zs.avail_out;
-    } else {
-        throw std::runtime_error("deflate compression failure");
-    }
-}
-
-size_t deflate_processor::compress_max_size(size_t input_len) const {
-    z_stream zs;
-    zs.zalloc = Z_NULL;
-    zs.zfree = Z_NULL;
-    zs.opaque = Z_NULL;
-    zs.avail_in = 0;
-    zs.next_in = Z_NULL;
-    if (deflateInit(&zs, Z_DEFAULT_COMPRESSION) != Z_OK) {
-        throw std::runtime_error("deflate compression init failure");
-    }
-    auto res = deflateBound(&zs, input_len);
-    deflateEnd(&zs);
-    return res;
-}
-
-size_t snappy_processor::uncompress(const char* input, size_t input_len,
-                char* output, size_t output_len) const {
-    if (snappy_uncompress(input, input_len, output, &output_len)
-            == SNAPPY_OK) {
-        return output_len;
-    } else {
-        throw std::runtime_error("snappy uncompression failure");
-    }
-}
-
-size_t snappy_processor::compress(const char* input, size_t input_len,
-                char* output, size_t output_len) const {
-    auto ret = snappy_compress(input, input_len, output, &output_len);
-    if (ret != SNAPPY_OK) {
-        throw std::runtime_error("snappy compression failure: snappy_compress() failed");
-    }
-    return output_len;
-}
-
-size_t snappy_processor::compress_max_size(size_t input_len) const {
-    return snappy_max_compressed_length(input_len);
-}
-

compress.hh

@@ -21,107 +21,135 @@
 
 #pragma once
 
-#include <map>
-#include <set>
-
-#include <seastar/core/future.hh>
-#include <seastar/core/shared_ptr.hh>
-#include <seastar/core/sstring.hh>
-
 #include "exceptions/exceptions.hh"
 
-
-class compressor {
-    sstring _name;
-public:
-    compressor(sstring);
-
-    virtual ~compressor() {}
-
-    /**
-     * Unpacks data in "input" to output. If output_len is of insufficient size,
-     * exception is thrown. I.e. you should keep track of the uncompressed size.
-     */
-    virtual size_t uncompress(const char* input, size_t input_len, char* output,
-                    size_t output_len) const = 0;
-    /**
-     * Packs data in "input" to output. If output_len is of insufficient size,
-     * exception is thrown. Maximum required size is obtained via "compress_max_size"
-     */
-    virtual size_t compress(const char* input, size_t input_len, char* output,
-                    size_t output_len) const = 0;
-    /**
-     * Returns the maximum output size for compressing data on "input_len" size.
-     */
-    virtual size_t compress_max_size(size_t input_len) const = 0;
-
-    /**
-     * Returns accepted option names for this compressor
-     */
-    virtual std::set<sstring> option_names() const;
-    /**
-     * Returns original options used in instantiating this compressor
-     */
-    virtual std::map<sstring, sstring> options() const;
-
-    /**
-     * Compressor class name.
-     */
-    const sstring& name() const {
-        return _name;
-    }
-
-    // to cheaply bridge sstable compression options / maps
-    using opt_string = std::optional<sstring>;
-    using opt_getter = std::function<opt_string(const sstring&)>;
-
-    static shared_ptr<compressor> create(const sstring& name, const opt_getter&);
-    static shared_ptr<compressor> create(const std::map<sstring, sstring>&);
-
-    static thread_local const shared_ptr<compressor> lz4;
-    static thread_local const shared_ptr<compressor> snappy;
-    static thread_local const shared_ptr<compressor> deflate;
-
-    static const sstring namespace_prefix;
+enum class compressor {
+    none,
+    lz4,
+    snappy,
+    deflate,
 };
 
-template<typename BaseType, typename... Args>
-class class_registry;
-
-using compressor_ptr = shared_ptr<compressor>;
-using compressor_registry = class_registry<compressor_ptr, const typename compressor::opt_getter&>;
-
 class compression_parameters {
 public:
     static constexpr int32_t DEFAULT_CHUNK_LENGTH = 4 * 1024;
     static constexpr double DEFAULT_CRC_CHECK_CHANCE = 1.0;
 
-    static const sstring SSTABLE_COMPRESSION;
-    static const sstring CHUNK_LENGTH_KB;
-    static const sstring CHUNK_LENGTH_KB_ERR;
-    static const sstring CRC_CHECK_CHANCE;
+    static constexpr auto SSTABLE_COMPRESSION = "sstable_compression";
+    static constexpr auto CHUNK_LENGTH_KB = "chunk_length_kb";
+    static constexpr auto CRC_CHECK_CHANCE = "crc_check_chance";
 private:
-    compressor_ptr _compressor;
-    std::optional<int> _chunk_length;
-    std::optional<double> _crc_check_chance;
+    compressor _compressor;
+    std::experimental::optional<int> _chunk_length;
+    std::experimental::optional<double> _crc_check_chance;
 public:
-    compression_parameters();
-    compression_parameters(compressor_ptr);
-    compression_parameters(const std::map<sstring, sstring>& options);
-    ~compression_parameters();
+    compression_parameters(compressor c = compressor::lz4) : _compressor(c) { }
+    compression_parameters(const std::map<sstring, sstring>& options) {
+        validate_options(options);
 
-    compressor_ptr get_compressor() const { return _compressor; }
+        auto it = options.find(SSTABLE_COMPRESSION);
+        if (it == options.end() || it->second.empty()) {
+            _compressor = compressor::none;
+            return;
+        }
+        const auto& compressor_class = it->second;
+        if (is_compressor_class(compressor_class, "LZ4Compressor")) {
+            _compressor = compressor::lz4;
+        } else if (is_compressor_class(compressor_class, "SnappyCompressor")) {
+            _compressor = compressor::snappy;
+        } else if (is_compressor_class(compressor_class, "DeflateCompressor")) {
+            _compressor = compressor::deflate;
+        } else {
+            throw exceptions::configuration_exception(sstring("Unsupported compression class '") + compressor_class + "'.");
+        }
+        auto chunk_length = options.find(CHUNK_LENGTH_KB);
+        if (chunk_length != options.end()) {
+            try {
+                _chunk_length = std::stoi(chunk_length->second) * 1024;
+            } catch (const std::exception& e) {
+                throw exceptions::syntax_exception(sstring("Invalid integer value ") + chunk_length->second + " for " + CHUNK_LENGTH_KB);
+            }
+        }
+        auto crc_chance = options.find(CRC_CHECK_CHANCE);
+        if (crc_chance != options.end()) {
+            try {
+                _crc_check_chance = std::stod(crc_chance->second);
+            } catch (const std::exception& e) {
+                throw exceptions::syntax_exception(sstring("Invalid double value ") + crc_chance->second + "for " + CRC_CHECK_CHANCE);
+            }
+        }
+    }
+
+    compressor get_compressor() const { return _compressor; }
     int32_t chunk_length() const { return _chunk_length.value_or(int(DEFAULT_CHUNK_LENGTH)); }
     double crc_check_chance() const { return _crc_check_chance.value_or(double(DEFAULT_CRC_CHECK_CHANCE)); }
 
-    void validate();
-    std::map<sstring, sstring> get_options() const;
-    bool operator==(const compression_parameters& other) const;
-    bool operator!=(const compression_parameters& other) const;
+    void validate() {
+        if (_chunk_length) {
+            auto chunk_length = _chunk_length.value();
+            if (chunk_length <= 0) {
+                throw exceptions::configuration_exception(sstring("Invalid negative or null ") + CHUNK_LENGTH_KB);
+            }
+            // _chunk_length must be a power of two
+            if (chunk_length & (chunk_length - 1)) {
+                throw exceptions::configuration_exception(sstring(CHUNK_LENGTH_KB) + " must be a power of 2.");
+            }
+        }
+        if (_crc_check_chance && (_crc_check_chance.value() < 0.0 || _crc_check_chance.value() > 1.0)) {
+            throw exceptions::configuration_exception(sstring(CRC_CHECK_CHANCE) + " must be between 0.0 and 1.0.");
+        }
+    }
 
-    static compression_parameters no_compression() {
-        return compression_parameters(nullptr);
+    std::map<sstring, sstring> get_options() const {
+        if (_compressor == compressor::none) {
+            return std::map<sstring, sstring>();
+        }
+        std::map<sstring, sstring> opts;
+        opts.emplace(sstring(SSTABLE_COMPRESSION), compressor_name());
+        if (_chunk_length) {
+            opts.emplace(sstring(CHUNK_LENGTH_KB), std::to_string(_chunk_length.value() / 1024));
+        }
+        if (_crc_check_chance) {
+            opts.emplace(sstring(CRC_CHECK_CHANCE), std::to_string(_crc_check_chance.value()));
+        }
+        return opts;
+    }
+    bool operator==(const compression_parameters& other) const {
+        return _compressor == other._compressor
+               && _chunk_length == other._chunk_length
+               && _crc_check_chance == other._crc_check_chance;
+    }
+    bool operator!=(const compression_parameters& other) const {
+        return !(*this == other);
     }
 private:
-    void validate_options(const std::map<sstring, sstring>&);
+    void validate_options(const std::map<sstring, sstring>& options) {
+        // currently, there are no options specific to a particular compressor
+        static std::set<sstring> keywords({
+            sstring(SSTABLE_COMPRESSION),
+            sstring(CHUNK_LENGTH_KB),
+            sstring(CRC_CHECK_CHANCE),
+        });
+        for (auto&& opt : options) {
+            if (!keywords.count(opt.first)) {
+                throw exceptions::configuration_exception(sprint("Unknown compression option '%s'.", opt.first));
+            }
+        }
+    }
+    bool is_compressor_class(const sstring& value, const sstring& class_name) {
+        static const sstring namespace_prefix = "org.apache.cassandra.io.compress.";
+        return value == class_name || value == namespace_prefix + class_name;
+    }
+    sstring compressor_name() const {
+        switch (_compressor) {
+        case compressor::lz4:
+             return "org.apache.cassandra.io.compress.LZ4Compressor";
+        case compressor::snappy:
+            return "org.apache.cassandra.io.compress.SnappyCompressor";
+        case compressor::deflate:
+            return "org.apache.cassandra.io.compress.DeflateCompressor";
+        default:
+            abort();
+        }
+    }
 };

conf/scylla.yaml

@@ -22,17 +22,17 @@
 # of tokens assuming they have equal hardware capability.
 #
 # If you already have a cluster with 1 token per node, and wish to migrate to 
-# multiple tokens per node, see http://cassandra.apache.org/doc/latest/operating
+# multiple tokens per node, see http://wiki.apache.org/cassandra/Operations
 num_tokens: 256
 
 # Directory where Scylla should store data on disk.
-# If not set, the default directory is /var/lib/scylla/data.
+# If not set, the default directory is $CASSANDRA_HOME/data/data.
 data_file_directories:
     - /var/lib/scylla/data
 
 # commit log.  when running on magnetic HDD, this should be a
 # separate spindle than the data directories.
-# If not set, the default directory is /var/lib/scylla/commitlog.
+# If not set, the default directory is $CASSANDRA_HOME/data/commitlog.
 commitlog_directory: /var/lib/scylla/commitlog
 
 # commitlog_sync may be either "periodic" or "batch."
@@ -65,7 +65,7 @@ commitlog_sync_period_in_ms: 10000
 commitlog_segment_size_in_mb: 32
 
 # seed_provider class_name is saved for future use.
-# seeds address(es) are mandatory!
+# seeds address are mandatory!
 seed_provider:
     # Addresses of hosts that are deemed contact points. 
     # Scylla nodes use this list of hosts to find each other and learn
@@ -107,6 +107,13 @@ native_transport_port: 9042
 # 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
+# can lead to saturating the network connection and degrading rpc performance.
+# When unset, the default is 200 Mbps or 25 MB/s.
+# stream_throughput_outbound_megabits_per_sec: 200
+
 # How long the coordinator should wait for read operations to complete
 read_request_timeout_in_ms: 5000
 
@@ -240,13 +247,11 @@ batch_size_fail_threshold_in_kb: 50
 # Uncomment to enable experimental features
 # experimental: true
 
-# The directory where hints files are stored if hinted handoff is enabled.
-# hints_directory: /var/lib/scylla/hints
- 
-# The directory where hints files are stored for materialized-view updates
-# view_hints_directory: /var/lib/scylla/view_hints
+###################################################
+## Not currently supported, reserved for future use
+###################################################
 
-# See https://docs.scylladb.com/architecture/anti-entropy/hinted-handoff
+# See http://wiki.apache.org/cassandra/HintedHandoff
 # May either be "true" or "false" to enable globally, or contain a list
 # of data centers to enable per-datacenter.
 # hinted_handoff_enabled: DC1,DC2
@@ -268,10 +273,6 @@ batch_size_fail_threshold_in_kb: 50
 # cross-dc handoff tends to be slower
 # max_hints_delivery_threads: 2
 
-###################################################
-## Not currently supported, reserved for future use
-###################################################
-
 # Maximum throttle in KBs per second, total. This will be
 # reduced proportionally to the number of nodes in the cluster.
 # batchlog_replay_throttle_in_kb: 1024
@@ -392,7 +393,7 @@ partitioner: org.apache.cassandra.dht.Murmur3Partitioner
 # memory_allocator: NativeAllocator
 
 # saved caches
-# If not set, the default directory is /var/lib/scylla/saved_caches.
+# If not set, the default directory is $CASSANDRA_HOME/data/saved_caches.
 # saved_caches_directory: /var/lib/scylla/saved_caches
 
 
@@ -538,7 +539,7 @@ commitlog_total_space_in_mb: -1
 # /proc/sys/net/core/wmem_max
 # /proc/sys/net/core/rmem_max
 # /proc/sys/net/ipv4/tcp_wmem
-# /proc/sys/net/ipv4/tcp_rmem
+# /proc/sys/net/ipv4/tcp_wmem
 # and: man tcp
 # internode_send_buff_size_in_bytes:
 # internode_recv_buff_size_in_bytes:
@@ -612,12 +613,9 @@ commitlog_total_space_in_mb: -1
 # of compaction, including validation compaction.
 # compaction_throughput_mb_per_sec: 16
 
-# Log a warning when writing partitions larger than this value
+# Log a warning when compacting partitions larger than this value
 # compaction_large_partition_warning_threshold_mb: 100
 
-# Log a warning when writing rows larger than this value
-# compaction_large_row_warning_threshold_mb: 50
-
 # When compacting, the replacement sstable(s) can be opened before they
 # are completely written, and used in place of the prior sstables for
 # any range that has been written. This helps to smoothly transfer reads 

converting_mutation_partition_applier.hh

@@ -38,45 +38,28 @@ 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 atomic_cell upgrade_cell(const abstract_type& new_type, const abstract_type& old_type, atomic_cell_view cell,
-                                    atomic_cell::collection_member cm = atomic_cell::collection_member::no) {
-        if (cell.is_live() && !old_type.is_counter()) {
-            if (cell.is_live_and_has_ttl()) {
-                return atomic_cell::make_live(new_type, cell.timestamp(), cell.value().linearize(), cell.expiry(), cell.ttl(), cm);
-            }
-            return atomic_cell::make_live(new_type, cell.timestamp(), cell.value().linearize(), cm);
-        } else {
-            return atomic_cell(new_type, cell);
-        }
-    }
     static 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()) {
-            return;
+        if (is_compatible(new_def, old_type, kind) && cell.timestamp() > new_def.dropped_at()) {
+            dst.apply(new_def, atomic_cell_or_collection(cell));
         }
-        dst.apply(new_def, upgrade_cell(*new_def.type, *old_type, cell));
     }
     static 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;
         }
-      cell.data.with_linearized([&] (bytes_view cell_bv) {
-        auto new_ctype = static_pointer_cast<const collection_type_impl>(new_def.type);
-        auto old_ctype = static_pointer_cast<const collection_type_impl>(old_type);
-        auto old_view = old_ctype->deserialize_mutation_form(cell_bv);
+        auto&& ctype = static_pointer_cast<const collection_type_impl>(old_type);
+        auto old_view = ctype->deserialize_mutation_form(cell);
 
-        collection_type_impl::mutation new_view;
+        collection_type_impl::mutation_view new_view;
         if (old_view.tomb.timestamp > new_def.dropped_at()) {
             new_view.tomb = old_view.tomb;
         }
         for (auto& c : old_view.cells) {
             if (c.second.timestamp() > new_def.dropped_at()) {
-                new_view.cells.emplace_back(c.first, upgrade_cell(*new_ctype->value_comparator(), *old_ctype->value_comparator(), c.second, atomic_cell::collection_member::yes));
+                new_view.cells.emplace_back(std::move(c));
             }
         }
-        if (new_view.tomb || !new_view.cells.empty()) {
-            dst.apply(new_def, new_ctype->serialize_mutation_form(std::move(new_view)));
-        }
-      });
+        dst.apply(new_def, ctype->serialize_mutation_form(std::move(new_view)));
     }
 public:
     converting_mutation_partition_applier(
@@ -92,10 +75,6 @@ public:
         _p.apply(t);
     }
 
-    void accept_static_cell(column_id id, atomic_cell cell) {
-        return accept_static_cell(id, atomic_cell_view(cell));
-    }
-
     virtual void accept_static_cell(column_id id, atomic_cell_view cell) override {
         const column_mapping_entry& col = _visited_column_mapping.static_column_at(id);
         const column_definition* def = _p_schema.get_column_definition(col.name());
@@ -123,10 +102,6 @@ public:
         _current_row = &r;
     }
 
-    void accept_row_cell(column_id id, atomic_cell cell) {
-        return accept_row_cell(id, atomic_cell_view(cell));
-    }
-
     virtual void accept_row_cell(column_id id, atomic_cell_view cell) override {
         const column_mapping_entry& col = _visited_column_mapping.regular_column_at(id);
         const column_definition* def = _p_schema.get_column_definition(col.name());
@@ -145,11 +120,11 @@ public:
 
     // 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 column_definition& old_def, const atomic_cell_or_collection& cell) {
+    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_def.type, cell.as_atomic_cell(old_def));
+            accept_cell(dst, kind, new_def, old_type, cell.as_atomic_cell());
         } else {
-            accept_cell(dst, kind, new_def, old_def.type, cell.as_collection_mutation());
+            accept_cell(dst, kind, new_def, old_type, cell.as_collection_mutation());
         }
     }
 };

counters.cc

@@ -78,10 +78,10 @@ std::vector<counter_shard> counter_cell_view::shards_compatible_with_1_7_4() con
     return sorted_shards;
 }
 
-static bool apply_in_place(const column_definition& cdef, atomic_cell_mutable_view dst, atomic_cell_mutable_view src)
+static bool apply_in_place(atomic_cell_or_collection& dst, atomic_cell_or_collection& src)
 {
-    auto dst_ccmv = counter_cell_mutable_view(dst);
-    auto src_ccmv = counter_cell_mutable_view(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();
 
@@ -118,19 +118,48 @@ static bool apply_in_place(const column_definition& cdef, atomic_cell_mutable_vi
     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;
 }
 
-void counter_cell_view::apply(const column_definition& cdef, atomic_cell_or_collection& dst, atomic_cell_or_collection& src)
+static void revert_in_place_apply(atomic_cell_or_collection& dst, atomic_cell_or_collection& src)
 {
-    auto dst_ac = dst.as_atomic_cell(cdef);
-    auto src_ac = src.as_atomic_cell(cdef);
+    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)
+{
+    auto dst_ac = dst.as_atomic_cell();
+    auto src_ac = src.as_atomic_cell();
 
     if (!dst_ac.is_live() || !src_ac.is_live()) {
         if (dst_ac.is_live() || (!src_ac.is_live() && compare_atomic_cell_for_merge(dst_ac, src_ac) < 0)) {
             std::swap(dst, src);
+            return true;
         }
-        return;
+        return false;
     }
 
     if (dst_ac.is_counter_update() && src_ac.is_counter_update()) {
@@ -138,26 +167,22 @@ void counter_cell_view::apply(const column_definition& cdef, atomic_cell_or_coll
         auto dst_v = dst_ac.counter_update_value();
         dst = atomic_cell::make_live_counter_update(std::max(dst_ac.timestamp(), src_ac.timestamp()),
                                                     src_v + dst_v);
-        return;
+        return true;
     }
 
     assert(!dst_ac.is_counter_update());
     assert(!src_ac.is_counter_update());
- with_linearized(dst_ac, [&] (counter_cell_view dst_ccv) {
-  with_linearized(src_ac, [&] (counter_cell_view src_ccv) {
 
-    if (dst_ccv.shard_count() >= src_ccv.shard_count()) {
-        auto dst_amc = dst.as_mutable_atomic_cell(cdef);
-        auto src_amc = src.as_mutable_atomic_cell(cdef);
-        if (!dst_amc.is_value_fragmented() && !src_amc.is_value_fragmented()) {
-            if (apply_in_place(cdef, dst_amc, src_amc)) {
-                return;
-            }
+    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;
         }
     }
 
-    auto dst_shards = dst_ccv.shards();
-    auto src_shards = src_ccv.shards();
+    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();
 
     counter_cell_builder result;
     combine(dst_shards.begin(), dst_shards.end(), src_shards.begin(), src_shards.end(),
@@ -166,27 +191,38 @@ void counter_cell_view::apply(const column_definition& cdef, atomic_cell_or_coll
             });
 
     auto cell = result.build(std::max(dst_ac.timestamp(), src_ac.timestamp()));
-    src = std::exchange(dst, atomic_cell_or_collection(std::move(cell)));
-  });
- });
+    src = std::exchange(dst, atomic_cell_or_collection(cell));
+    return true;
 }
 
-std::optional<atomic_cell> counter_cell_view::difference(atomic_cell_view a, atomic_cell_view b)
+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();
+        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);
+    }
+}
+
+stdx::optional<atomic_cell> counter_cell_view::difference(atomic_cell_view a, atomic_cell_view b)
 {
     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(*counter_type, a);
+            return atomic_cell(a);
         }
         return { };
     }
 
- return with_linearized(a, [&] (counter_cell_view a_ccv) {
-  return with_linearized(b, [&] (counter_cell_view b_ccv) {
-    auto a_shards = a_ccv.shards();
-    auto b_shards = b_ccv.shards();
+    auto a_shards = counter_cell_view(a).shards();
+    auto b_shards = counter_cell_view(b).shards();
 
     auto a_it = a_shards.begin();
     auto a_end = a_shards.end();
@@ -204,25 +240,22 @@ std::optional<atomic_cell> counter_cell_view::difference(atomic_cell_view a, ato
         ++a_it;
     }
 
-    std::optional<atomic_cell> diff;
+    stdx::optional<atomic_cell> diff;
     if (!result.empty()) {
         diff = result.build(std::max(a.timestamp(), b.timestamp()));
     } else if (a.timestamp() > b.timestamp()) {
-        diff = atomic_cell::make_live(*counter_type, a.timestamp(), bytes_view());
+        diff = atomic_cell::make_live(a.timestamp(), bytes_view());
     }
     return diff;
-  });
- });
 }
 
 
 void transform_counter_updates_to_shards(mutation& m, const mutation* current_state, uint64_t clock_offset) {
     // FIXME: allow current_state to be frozen_mutation
 
-    auto transform_new_row_to_shards = [&s = *m.schema(), clock_offset] (column_kind kind, auto& cells) {
-        cells.for_each_cell([&] (column_id id, atomic_cell_or_collection& ac_o_c) {
-            auto& cdef = s.column_at(kind, id);
-            auto acv = ac_o_c.as_atomic_cell(cdef);
+    auto transform_new_row_to_shards = [clock_offset] (auto& cells) {
+        cells.for_each_cell([clock_offset] (auto, atomic_cell_or_collection& ac_o_c) {
+            auto acv = ac_o_c.as_atomic_cell();
             if (!acv.is_live()) {
                 return; // continue -- we are in lambda
             }
@@ -233,35 +266,32 @@ void transform_counter_updates_to_shards(mutation& m, const mutation* current_st
     };
 
     if (!current_state) {
-        transform_new_row_to_shards(column_kind::static_column, m.partition().static_row());
+        transform_new_row_to_shards(m.partition().static_row());
         for (auto& cr : m.partition().clustered_rows()) {
-            transform_new_row_to_shards(column_kind::regular_column, cr.row().cells());
+            transform_new_row_to_shards(cr.row().cells());
         }
         return;
     }
 
     clustering_key::less_compare cmp(*m.schema());
 
-    auto transform_row_to_shards = [&s = *m.schema(), clock_offset] (column_kind kind, auto& transformee, auto& state) {
+    auto transform_row_to_shards = [clock_offset] (auto& transformee, auto& state) {
         std::deque<std::pair<column_id, counter_shard>> shards;
         state.for_each_cell([&] (column_id id, const atomic_cell_or_collection& ac_o_c) {
-            auto& cdef = s.column_at(kind, id);
-            auto acv = ac_o_c.as_atomic_cell(cdef);
+            auto acv = ac_o_c.as_atomic_cell();
             if (!acv.is_live()) {
                 return; // continue -- we are in lambda
             }
-          counter_cell_view::with_linearized(acv, [&] (counter_cell_view ccv) {
+            counter_cell_view ccv(acv);
             auto cs = ccv.local_shard();
             if (!cs) {
                 return; // continue
             }
             shards.emplace_back(std::make_pair(id, counter_shard(*cs)));
-          });
         });
 
         transformee.for_each_cell([&] (column_id id, atomic_cell_or_collection& ac_o_c) {
-            auto& cdef = s.column_at(kind, id);
-            auto acv = ac_o_c.as_atomic_cell(cdef);
+            auto acv = ac_o_c.as_atomic_cell();
             if (!acv.is_live()) {
                 return; // continue -- we are in lambda
             }
@@ -283,7 +313,7 @@ void transform_counter_updates_to_shards(mutation& m, const mutation* current_st
         });
     };
 
-    transform_row_to_shards(column_kind::static_column, m.partition().static_row(), current_state->partition().static_row());
+    transform_row_to_shards(m.partition().static_row(), current_state->partition().static_row());
 
     auto& cstate = current_state->partition();
     auto it = cstate.clustered_rows().begin();
@@ -293,10 +323,10 @@ void transform_counter_updates_to_shards(mutation& m, const mutation* current_st
             ++it;
         }
         if (it == end || cmp(cr.key(), it->key())) {
-            transform_new_row_to_shards(column_kind::regular_column, cr.row().cells());
+            transform_new_row_to_shards(cr.row().cells());
             continue;
         }
 
-        transform_row_to_shards(column_kind::regular_column, cr.row().cells(), it->row().cells());
+        transform_row_to_shards(cr.row().cells(), it->row().cells());
     }
 }

counters.hh

@@ -26,6 +26,8 @@
 #include "atomic_cell_or_collection.hh"
 #include "types.hh"
 
+#include "stdx.hh"
+
 class mutation;
 
 class mutation;
@@ -77,7 +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<mutable_view is_mutable>
+template<typename View>
 class basic_counter_shard_view {
     enum class offset : unsigned {
         id = 0u,
@@ -86,8 +88,7 @@ class basic_counter_shard_view {
         total_size = unsigned(logical_clock) + sizeof(int64_t),
     };
 private:
-    using pointer_type = std::conditional_t<is_mutable == mutable_view::no, const signed char*, signed char*>;
-    pointer_type _base;
+    typename View::pointer _base;
 private:
     template<typename T>
     T read(offset off) const {
@@ -99,7 +100,7 @@ public:
     static constexpr auto size = size_t(offset::total_size);
 public:
     basic_counter_shard_view() = default;
-    explicit basic_counter_shard_view(pointer_type ptr) noexcept
+    explicit basic_counter_shard_view(typename View::pointer ptr) noexcept
         : _base(ptr) { }
 
     counter_id id() const { return read<counter_id>(offset::id); }
@@ -110,7 +111,7 @@ public:
         static constexpr size_t off = size_t(offset::value);
         static constexpr size_t size = size_t(offset::total_size) - off;
 
-        signed char tmp[size];
+        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);
@@ -137,7 +138,7 @@ public:
     };
 };
 
-using counter_shard_view = basic_counter_shard_view<mutable_view::no>;
+using counter_shard_view = basic_counter_shard_view<bytes_view>;
 
 std::ostream& operator<<(std::ostream& os, counter_shard_view csv);
 
@@ -197,7 +198,7 @@ public:
         return do_apply(other);
     }
 
-    static constexpr size_t serialized_size() {
+    static size_t serialized_size() {
         return counter_shard_view::size;
     }
     void serialize(bytes::iterator& out) const {
@@ -251,33 +252,15 @@ public:
     }
 
     atomic_cell build(api::timestamp_type timestamp) const {
-        // If we can assume that the counter shards never cross fragment boundaries
-        // the serialisation code gets much simpler.
-        static_assert(data::cell::maximum_external_chunk_length % counter_shard::serialized_size() == 0);
-
-        auto ac = atomic_cell::make_live_uninitialized(*counter_type, timestamp, serialized_size());
-
-        auto dst_it = ac.value().begin();
-        auto dst_current = *dst_it++;
-        for (auto&& cs : _shards) {
-            if (dst_current.empty()) {
-                dst_current = *dst_it++;
-            }
-            assert(!dst_current.empty());
-            auto value_dst = dst_current.data();
-            cs.serialize(value_dst);
-            dst_current.remove_prefix(counter_shard::serialized_size());
-        }
-        return ac;
+        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) {
-        // We don't really need to bother with fragmentation here.
-        static_assert(data::cell::maximum_external_chunk_length >= counter_shard::serialized_size());
-        auto ac = atomic_cell::make_live_uninitialized(*counter_type, timestamp, counter_shard::serialized_size());
-        auto dst = ac.value().first_fragment().begin();
-        cs.serialize(dst);
-        return ac;
+        return atomic_cell::make_live_from_serializer(timestamp, counter_shard::serialized_size(), [&cs] (bytes::iterator out) {
+            cs.serialize(out);
+        });
     }
 
     class inserter_iterator : public std::iterator<std::output_iterator_tag, counter_shard> {
@@ -304,32 +287,28 @@ public:
 // <counter_id>   := <int64_t><int64_t>
 // <shard>        := <counter_id><int64_t:value><int64_t:logical_clock>
 // <counter_cell> := <shard>*
-template<mutable_view is_mutable>
+template<typename View>
 class basic_counter_cell_view {
 protected:
-    using linearized_value_view = std::conditional_t<is_mutable == mutable_view::no,
-                                                     bytes_view, bytes_mutable_view>;
-    using pointer_type = typename linearized_value_view::pointer;
-    basic_atomic_cell_view<is_mutable> _cell;
-    linearized_value_view _value;
+    atomic_cell_base<View> _cell;
 private:
-    class shard_iterator : public std::iterator<std::input_iterator_tag, basic_counter_shard_view<is_mutable>> {
-        pointer_type _current;
-        basic_counter_shard_view<is_mutable> _current_view;
+    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;
     public:
         shard_iterator() = default;
-        shard_iterator(pointer_type ptr) noexcept
+        shard_iterator(typename View::pointer ptr) noexcept
             : _current(ptr), _current_view(ptr) { }
 
-        basic_counter_shard_view<is_mutable>& operator*() noexcept {
+        basic_counter_shard_view<View>& operator*() noexcept {
             return _current_view;
         }
-        basic_counter_shard_view<is_mutable>* operator->() noexcept {
+        basic_counter_shard_view<View>* operator->() noexcept {
             return &_current_view;
         }
         shard_iterator& operator++() noexcept {
             _current += counter_shard_view::size;
-            _current_view = basic_counter_shard_view<is_mutable>(_current);
+            _current_view = basic_counter_shard_view<View>(_current);
             return *this;
         }
         shard_iterator operator++(int) noexcept {
@@ -339,7 +318,7 @@ private:
         }
         shard_iterator& operator--() noexcept {
             _current -= counter_shard_view::size;
-            _current_view = basic_counter_shard_view<is_mutable>(_current);
+            _current_view = basic_counter_shard_view<View>(_current);
             return *this;
         }
         shard_iterator operator--(int) noexcept {
@@ -356,23 +335,22 @@ private:
     };
 public:
     boost::iterator_range<shard_iterator> shards() const {
-        auto begin = shard_iterator(_value.data());
-        auto end = shard_iterator(_value.data() + _value.size());
+        auto bv = _cell.value();
+        auto begin = shard_iterator(bv.data());
+        auto end = shard_iterator(bv.data() + bv.size());
         return boost::make_iterator_range(begin, end);
     }
 
     size_t shard_count() const {
-        return _cell.value().size_bytes() / counter_shard_view::size;
+        return _cell.value().size() / counter_shard_view::size;
     }
-protected:
+public:
     // ac must be a live counter cell
-    explicit basic_counter_cell_view(basic_atomic_cell_view<is_mutable> ac, linearized_value_view vv) noexcept
-        : _cell(ac), _value(vv)
-    {
+    explicit basic_counter_cell_view(atomic_cell_base<View> ac) noexcept : _cell(ac) {
         assert(_cell.is_live());
         assert(!_cell.is_counter_update());
     }
-public:
+
     api::timestamp_type timestamp() const { return _cell.timestamp(); }
 
     static data_type total_value_type() { return long_type; }
@@ -383,7 +361,7 @@ public:
         });
     }
 
-    std::optional<counter_shard_view> get_shard(const counter_id& id) const {
+    stdx::optional<counter_shard_view> get_shard(const counter_id& id) const {
         auto it = boost::range::find_if(shards(), [&id] (counter_shard_view csv) {
             return csv.id() == id;
         });
@@ -393,7 +371,7 @@ public:
         return *it;
     }
 
-    std::optional<counter_shard_view> local_shard() const {
+    stdx::optional<counter_shard_view> local_shard() const {
         // TODO: consider caching local shard position
         return get_shard(counter_id::local());
     }
@@ -403,39 +381,29 @@ public:
     }
 };
 
-struct counter_cell_view : basic_counter_cell_view<mutable_view::no> {
+struct counter_cell_view : basic_counter_cell_view<bytes_view> {
     using basic_counter_cell_view::basic_counter_cell_view;
 
-    template<typename Function>
-    static decltype(auto) with_linearized(basic_atomic_cell_view<mutable_view::no> ac, Function&& fn) {
-        return ac.value().with_linearized([&] (bytes_view value_view) {
-            counter_cell_view ccv(ac, value_view);
-            return fn(ccv);
-        });
-    }
-
     // 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;
 
     // Reversibly applies two counter cells, at least one of them must be live.
-    static void apply(const column_definition& cdef, atomic_cell_or_collection& dst, atomic_cell_or_collection& src);
+    // Returns true iff dst was modified.
+    static bool apply_reversibly(atomic_cell_or_collection& dst, atomic_cell_or_collection& src);
+
+    // Reverts apply performed by apply_reversible().
+    static void revert_apply(atomic_cell_or_collection& dst, atomic_cell_or_collection& src);
 
     // Computes a counter cell containing minimal amount of data which, when
     // applied to 'b' returns the same cell as 'a' and 'b' applied together.
-    static std::optional<atomic_cell> difference(atomic_cell_view a, atomic_cell_view b);
+    static stdx::optional<atomic_cell> difference(atomic_cell_view a, atomic_cell_view b);
 
     friend std::ostream& operator<<(std::ostream& os, counter_cell_view ccv);
 };
 
-struct counter_cell_mutable_view : basic_counter_cell_view<mutable_view::yes> {
+struct counter_cell_mutable_view : basic_counter_cell_view<bytes_mutable_view> {
     using basic_counter_cell_view::basic_counter_cell_view;
 
-    explicit counter_cell_mutable_view(atomic_cell_mutable_view ac) noexcept
-        : basic_counter_cell_view<mutable_view::yes>(ac, ac.value().first_fragment())
-    {
-        assert(!ac.value().is_fragmented());
-    }
-
     void set_timestamp(api::timestamp_type ts) { _cell.set_timestamp(ts); }
 };
 

cpu_controller.hh

@@ -0,0 +1,89 @@
+/*
+ * 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

@@ -56,16 +56,13 @@ options {
 #include "cql3/statements/index_prop_defs.hh"
 #include "cql3/statements/raw/use_statement.hh"
 #include "cql3/statements/raw/batch_statement.hh"
+#include "cql3/statements/create_user_statement.hh"
+#include "cql3/statements/alter_user_statement.hh"
+#include "cql3/statements/drop_user_statement.hh"
 #include "cql3/statements/list_users_statement.hh"
 #include "cql3/statements/grant_statement.hh"
 #include "cql3/statements/revoke_statement.hh"
 #include "cql3/statements/list_permissions_statement.hh"
-#include "cql3/statements/alter_role_statement.hh"
-#include "cql3/statements/list_roles_statement.hh"
-#include "cql3/statements/grant_role_statement.hh"
-#include "cql3/statements/revoke_role_statement.hh"
-#include "cql3/statements/drop_role_statement.hh"
-#include "cql3/statements/create_role_statement.hh"
 #include "cql3/statements/index_target.hh"
 #include "cql3/statements/ks_prop_defs.hh"
 #include "cql3/selection/raw_selector.hh"
@@ -83,18 +80,15 @@ options {
 #include "cql3/maps.hh"
 #include "cql3/sets.hh"
 #include "cql3/lists.hh"
-#include "cql3/role_name.hh"
-#include "cql3/role_options.hh"
 #include "cql3/type_cast.hh"
 #include "cql3/tuples.hh"
 #include "cql3/user_types.hh"
 #include "cql3/ut_name.hh"
 #include "cql3/functions/function_name.hh"
 #include "cql3/functions/function_call.hh"
-#include <seastar/core/sstring.hh>
+#include "core/sstring.hh"
 #include "CqlLexer.hpp"
 
-#include <algorithm>
 #include <unordered_map>
 #include <map>
 }
@@ -115,7 +109,7 @@ using operations_type = std::vector<std::pair<::shared_ptr<cql3::column_identifi
 // problem.  It is up to the user to ensure it is actually assigned to. 
 template <typename T>
 struct uninitialized {
-    std::optional<T> _val;
+    std::experimental::optional<T> _val;
     uninitialized() = default;
     uninitialized(const uninitialized&) = default;
     uninitialized(uninitialized&&) = default;
@@ -242,18 +236,13 @@ struct uninitialized {
         return res;
     }
 
-    bool convert_boolean_literal(std::string_view s) {
-        std::string lower_s(s.size(), '\0');
-        std::transform(s.cbegin(), s.cend(), lower_s.begin(), &::tolower);
-        return lower_s == "true";
-    }
-
     void add_raw_update(std::vector<std::pair<::shared_ptr<cql3::column_identifier::raw>,::shared_ptr<cql3::operation::raw_update>>>& operations,
         ::shared_ptr<cql3::column_identifier::raw> key, ::shared_ptr<cql3::operation::raw_update> update)
     {
         for (auto&& p : operations) {
             if (*p.first == *key && !p.second->is_compatible_with(update)) {
-                add_recognition_error(format("Multiple incompatible setting of column {}", *key));
+                // \%s is escaped for antlr
+                add_recognition_error(sprint("Multiple incompatible setting of column \%s", *key));
             }
         }
         operations.emplace_back(std::move(key), std::move(update));
@@ -356,12 +345,6 @@ cqlStatement returns [shared_ptr<raw::parsed_statement> stmt]
     | st32=createViewStatement         { $stmt = st32; }
     | st33=alterViewStatement          { $stmt = st33; }
     | st34=dropViewStatement           { $stmt = st34; }
-    | st35=listRolesStatement          { $stmt = st35; }
-    | st36=grantRoleStatement          { $stmt = st36; }
-    | st37=revokeRoleStatement         { $stmt = st37; }
-    | st38=dropRoleStatement           { $stmt = st38; }
-    | st39=createRoleStatement         { $stmt = st39; }
-    | st40=alterRoleStatement          { $stmt = st40; }
     ;
 
 /*
@@ -372,7 +355,7 @@ useStatement returns [::shared_ptr<raw::use_statement> stmt]
     ;
 
 /**
- * SELECT [JSON] <expression>
+ * SELECT <expression>
  * FROM <CF>
  * WHERE KEY = "key1" AND COL > 1 AND COL < 100
  * LIMIT <NUMBER>;
@@ -381,28 +364,22 @@ selectStatement returns [shared_ptr<raw::select_statement> expr]
     @init {
         bool is_distinct = false;
         ::shared_ptr<cql3::term::raw> limit;
-        ::shared_ptr<cql3::term::raw> per_partition_limit;
         raw::select_statement::parameters::orderings_type orderings;
         bool allow_filtering = false;
-        bool is_json = false;
-        bool bypass_cache = false;
     }
-    : K_SELECT (
-                ( K_JSON { is_json = true; } )?
-                ( K_DISTINCT { is_distinct = true; } )?
-                sclause=selectClause
+    : K_SELECT ( ( K_DISTINCT { is_distinct = true; } )?
+                 sclause=selectClause
+               | sclause=selectCountClause
                )
       K_FROM cf=columnFamilyName
       ( K_WHERE wclause=whereClause )?
       ( K_ORDER K_BY orderByClause[orderings] ( ',' orderByClause[orderings] )* )?
-      ( K_PER K_PARTITION K_LIMIT rows=intValue { per_partition_limit = rows; } )?
       ( K_LIMIT rows=intValue { limit = rows; } )?
       ( K_ALLOW K_FILTERING  { allow_filtering = true; } )?
-      ( K_BYPASS K_CACHE { bypass_cache = true; })?
       {
-          auto params = ::make_shared<raw::select_statement::parameters>(std::move(orderings), is_distinct, allow_filtering, is_json, bypass_cache);
+          auto params = ::make_shared<raw::select_statement::parameters>(std::move(orderings), is_distinct, allow_filtering);
           $expr = ::make_shared<raw::select_statement>(std::move(cf), std::move(params),
-            std::move(sclause), std::move(wclause), std::move(limit), std::move(per_partition_limit));
+            std::move(sclause), std::move(wclause), std::move(limit));
       }
     ;
 
@@ -419,7 +396,6 @@ selector returns [shared_ptr<raw_selector> s]
 unaliasedSelector returns [shared_ptr<selectable::raw> s]
     @init { shared_ptr<selectable::raw> tmp; }
     :  ( c=cident                                  { tmp = c; }
-       | K_COUNT '(' countArgument ')'             { tmp = selectable::with_function::raw::make_count_rows_function(); }
        | 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)); }
@@ -436,6 +412,16 @@ selectionFunctionArgs returns [std::vector<shared_ptr<selectable::raw>> a]
       ')'
     ;
 
+selectCountClause returns [std::vector<shared_ptr<raw_selector>> expr]
+    @init{ auto alias = make_shared<cql3::column_identifier>("count", false); }
+    : K_COUNT '(' countArgument ')' (K_AS c=ident { alias = c; })? {
+        auto&& with_fn = ::make_shared<cql3::selection::selectable::with_function::raw>(
+     	    cql3::functions::function_name::native_function("countRows"),
+     	        std::vector<shared_ptr<cql3::selection::selectable::raw>>()); 
+     	$expr.push_back(make_shared<cql3::selection::raw_selector>(with_fn, alias));
+     }
+    ;
+
 countArgument
     : '*'
     | i=INTEGER { if (i->getText() != "1") {
@@ -454,54 +440,33 @@ orderByClause[raw::select_statement::parameters::orderings_type& orderings]
     : c=cident (K_ASC | K_DESC { reversed = true; })? { orderings.emplace_back(c, reversed); }
     ;
 
-jsonValue returns [::shared_ptr<cql3::term::raw> value]
-    :
-    | s=STRING_LITERAL { $value = cql3::constants::literal::string(sstring{$s.text}); }
-    | ':' id=ident     { $value = new_bind_variables(id); }
-    | QMARK            { $value = new_bind_variables(shared_ptr<cql3::column_identifier>{}); }
-    ;
-
 /**
  * INSERT INTO <CF> (<column>, <column>, <column>, ...)
  * VALUES (<value>, <value>, <value>, ...)
  * USING TIMESTAMP <long>;
  *
  */
-insertStatement returns [::shared_ptr<raw::modification_statement> expr]
+insertStatement returns [::shared_ptr<raw::insert_statement> expr]
     @init {
         auto attrs = ::make_shared<cql3::attributes::raw>();
         std::vector<::shared_ptr<cql3::column_identifier::raw>> column_names;
         std::vector<::shared_ptr<cql3::term::raw>> values;
         bool if_not_exists = false;
-        bool default_unset = false;
-        ::shared_ptr<cql3::term::raw> json_value;
     }
     : K_INSERT K_INTO cf=columnFamilyName
-        ('(' c1=cident { column_names.push_back(c1); }  ( ',' cn=cident { column_names.push_back(cn); } )* ')'
-            K_VALUES
-            '(' v1=term { values.push_back(v1); } ( ',' vn=term { values.push_back(vn); } )* ')'
-            ( K_IF K_NOT K_EXISTS { if_not_exists = true; } )?
-            ( usingClause[attrs] )?
-              {
-              $expr = ::make_shared<raw::insert_statement>(std::move(cf),
-                                                       std::move(attrs),
-                                                       std::move(column_names),
-                                                       std::move(values),
-                                                       if_not_exists);
-              }
-        | K_JSON
-          json_token=jsonValue { json_value = $json_token.value; }
-            ( K_DEFAULT K_UNSET { default_unset = true; } | K_DEFAULT K_NULL )?
-            ( K_IF K_NOT K_EXISTS { if_not_exists = true; } )?
-            ( usingClause[attrs] )?
-              {
-              $expr = ::make_shared<raw::insert_json_statement>(std::move(cf),
-                                                       std::move(attrs),
-                                                       std::move(json_value),
-                                                       if_not_exists,
-                                                       default_unset);
-              }
-        )
+          '(' c1=cident { column_names.push_back(c1); }  ( ',' cn=cident { column_names.push_back(cn); } )* ')'
+        K_VALUES
+          '(' v1=term { values.push_back(v1); } ( ',' vn=term { values.push_back(vn); } )* ')'
+
+        ( K_IF K_NOT K_EXISTS { if_not_exists = true; } )?
+        ( usingClause[attrs] )?
+      {
+          $expr = ::make_shared<raw::insert_statement>(std::move(cf),
+                                                   std::move(attrs),
+                                                   std::move(column_names),
+                                                   std::move(values),
+                                                   if_not_exists);
+      }
     ;
 
 usingClause[::shared_ptr<cql3::attributes::raw> attrs]
@@ -823,15 +788,10 @@ createIndexStatement returns [::shared_ptr<create_index_statement> expr]
     ;
 
 indexIdent returns [::shared_ptr<index_target::raw> id]
-    @init {
-        std::vector<::shared_ptr<cql3::column_identifier::raw>> columns;
-    }
     : c=cident                   { $id = index_target::raw::values_of(c); }
     | K_KEYS '(' c=cident ')'    { $id = index_target::raw::keys_of(c); }
     | K_ENTRIES '(' c=cident ')' { $id = index_target::raw::keys_and_values_of(c); }
     | K_FULL '(' c=cident ')'    { $id = index_target::raw::full_collection(c); }
-    | '(' c1=cident { columns.push_back(c1); } ( ',' cn=cident { columns.push_back(cn); } )* ')' { $id = index_target::raw::columns(std::move(columns)); }
-
     ;
 
 /**
@@ -905,8 +865,8 @@ alterKeyspaceStatement returns [shared_ptr<cql3::statements::alter_keyspace_stat
 
 /**
  * ALTER COLUMN FAMILY <CF> ALTER <column> TYPE <newtype>;
- * ALTER COLUMN FAMILY <CF> ADD <column> <newtype>; | ALTER COLUMN FAMILY <CF> ADD (<column> <newtype>,<column1> <newtype1>..... <column n> <newtype n>)
- * ALTER COLUMN FAMILY <CF> DROP <column>; | ALTER COLUMN FAMILY <CF> DROP ( <column>,<column1>.....<column n>)
+ * ALTER COLUMN FAMILY <CF> ADD <column> <newtype>;
+ * ALTER COLUMN FAMILY <CF> DROP <column>;
  * ALTER COLUMN FAMILY <CF> WITH <property> = <value>;
  * ALTER COLUMN FAMILY <CF> RENAME <column> TO <column>;
  */
@@ -914,38 +874,21 @@ alterTableStatement returns [shared_ptr<alter_table_statement> expr]
     @init {
         alter_table_statement::type type;
         auto props = make_shared<cql3::statements::cf_prop_defs>();
-        std::vector<alter_table_statement::column_change> column_changes;
         std::vector<std::pair<shared_ptr<cql3::column_identifier::raw>, shared_ptr<cql3::column_identifier::raw>>> renames;
+        bool is_static = false;
     }
     : K_ALTER K_COLUMNFAMILY cf=columnFamilyName
-          ( K_ALTER id=cident K_TYPE v=comparatorType { type = alter_table_statement::type::alter; column_changes.emplace_back(alter_table_statement::column_change{id, v}); }
-          | K_ADD                                     { type = alter_table_statement::type::add; }
-            (          id=cident   v=comparatorType   s=cfisStatic { column_changes.emplace_back(alter_table_statement::column_change{id,  v,  s});  }
-            | '('     id1=cident  v1=comparatorType  s1=cfisStatic { column_changes.emplace_back(alter_table_statement::column_change{id1, v1, s1}); }
-                 (',' idn=cident  vn=comparatorType  sn=cfisStatic { column_changes.emplace_back(alter_table_statement::column_change{idn, vn, sn}); } )* ')'
-            )
-          | K_DROP                                    { type = alter_table_statement::type::drop; }
-            (          id=cident { column_changes.emplace_back(alter_table_statement::column_change{id});  }
-            | '('     id1=cident { column_changes.emplace_back(alter_table_statement::column_change{id1}); }
-                 (',' idn=cident { column_changes.emplace_back(alter_table_statement::column_change{idn}); } )* ')'
-            )
+          ( K_ALTER id=cident K_TYPE v=comparatorType { type = alter_table_statement::type::alter; }
+          | K_ADD   id=cident v=comparatorType ({ is_static=true; } K_STATIC)? { type = alter_table_statement::type::add; }
+          | K_DROP  id=cident                         { type = alter_table_statement::type::drop; }
           | K_WITH  properties[props]                 { type = alter_table_statement::type::opts; }
           | K_RENAME                                  { type = alter_table_statement::type::rename; }
                id1=cident K_TO toId1=cident { renames.emplace_back(id1, toId1); }
                ( K_AND idn=cident K_TO toIdn=cident { renames.emplace_back(idn, toIdn); } )*
           )
     {
-        $expr = ::make_shared<alter_table_statement>(std::move(cf), type, std::move(column_changes), std::move(props), std::move(renames));
-    }
-    ;
-
-cfisStatic returns [bool isStaticColumn]
-    @init{
-        bool isStatic = false;
-    }
-    : (K_STATIC { isStatic=true; })?
-    {
-        $isStaticColumn = isStatic;
+        $expr = ::make_shared<alter_table_statement>(std::move(cf), type, std::move(id),
+            std::move(v), std::move(props), std::move(renames), is_static);
     }
     ;
 
@@ -1032,7 +975,7 @@ truncateStatement returns [::shared_ptr<truncate_statement> stmt]
     ;
 
 /**
- * GRANT <permission> ON <resource> TO <grantee>
+ * GRANT <permission> ON <resource> TO <username>
  */
 grantStatement returns [::shared_ptr<grant_statement> stmt]
     : K_GRANT
@@ -1040,12 +983,12 @@ grantStatement returns [::shared_ptr<grant_statement> stmt]
       K_ON
           resource
       K_TO
-          grantee=userOrRoleName
-      { $stmt = ::make_shared<grant_statement>($permissionOrAll.perms, $resource.res, std::move(grantee)); } 
+          username
+      { $stmt = ::make_shared<grant_statement>($permissionOrAll.perms, $resource.res, $username.text); } 
     ;
 
 /**
- * REVOKE <permission> ON <resource> FROM <revokee>
+ * REVOKE <permission> ON <resource> FROM <username>
  */
 revokeStatement returns [::shared_ptr<revoke_statement> stmt]
     : K_REVOKE
@@ -1053,104 +996,80 @@ revokeStatement returns [::shared_ptr<revoke_statement> stmt]
       K_ON
           resource
       K_FROM
-          revokee=userOrRoleName
-      { $stmt = ::make_shared<revoke_statement>($permissionOrAll.perms, $resource.res, std::move(revokee)); } 
-    ;
-
-/**
- * GRANT <rolename> to <grantee>
- */
-grantRoleStatement returns [::shared_ptr<grant_role_statement> stmt]
-    : K_GRANT role=userOrRoleName K_TO grantee=userOrRoleName
-      { $stmt = ::make_shared<grant_role_statement>(std::move(role), std::move(grantee));  }
-    ;
-
-/**
- * REVOKE <rolename> FROM <revokee>
- */
-revokeRoleStatement returns [::shared_ptr<revoke_role_statement> stmt]
-    : K_REVOKE role=userOrRoleName K_FROM revokee=userOrRoleName
-      { $stmt = ::make_shared<revoke_role_statement>(std::move(role), std::move(revokee)); }
+          username
+      { $stmt = ::make_shared<revoke_statement>($permissionOrAll.perms, $resource.res, $username.text); } 
     ;
 
 listPermissionsStatement returns [::shared_ptr<list_permissions_statement> stmt]
     @init {
-		std::optional<auth::resource> r;
-		std::optional<sstring> role;
+		std::experimental::optional<auth::data_resource> r;
+		std::experimental::optional<sstring> u;
 		bool recursive = true;
     }
     : K_LIST
           permissionOrAll
       ( K_ON resource { r = $resource.res; } )?
-      ( K_OF rn=userOrRoleName { role = sstring(static_cast<cql3::role_name>(rn).to_string()); } )?
+      ( K_OF username { u = sstring($username.text); } )?
       ( K_NORECURSIVE { recursive = false; } )?
-      { $stmt = ::make_shared<list_permissions_statement>($permissionOrAll.perms, std::move(r), std::move(role), recursive); } 
+      { $stmt = ::make_shared<list_permissions_statement>($permissionOrAll.perms, std::move(r), std::move(u), recursive); } 
     ;
 
 permission returns [auth::permission perm]
-    : p=(K_CREATE | K_ALTER | K_DROP | K_SELECT | K_MODIFY | K_AUTHORIZE | K_DESCRIBE)
+    : p=(K_CREATE | K_ALTER | K_DROP | K_SELECT | K_MODIFY | K_AUTHORIZE)
     { $perm = auth::permissions::from_string($p.text); }
     ;
 
 permissionOrAll returns [auth::permission_set perms]
-    : K_ALL ( K_PERMISSIONS )?       { $perms = auth::permissions::ALL; }
+    : K_ALL ( K_PERMISSIONS )?       { $perms = auth::permissions::ALL_DATA; }
     | p=permission ( K_PERMISSION )? { $perms = auth::permission_set::from_mask(auth::permission_set::mask_for($p.perm)); }
     ;
 
-resource returns [uninitialized<auth::resource> res]
-    : d=dataResource { $res = std::move(d); }
-    | r=roleResource { $res = std::move(r); }
+resource returns [auth::data_resource res]
+    : r=dataResource { $res = $r.res; }
     ;
 
-dataResource returns [uninitialized<auth::resource> res]
-    : K_ALL K_KEYSPACES { $res = auth::resource(auth::resource_kind::data); }
-    | K_KEYSPACE ks = keyspaceName { $res = auth::make_data_resource($ks.id); }
+dataResource returns [auth::data_resource res]
+    : K_ALL K_KEYSPACES { $res = auth::data_resource(); }
+    | K_KEYSPACE ks = keyspaceName { $res = auth::data_resource($ks.id); }
     | ( K_COLUMNFAMILY )? cf = columnFamilyName
-      { $res = auth::make_data_resource($cf.name->get_keyspace(), $cf.name->get_column_family()); }
-    ;
-
-roleResource returns [uninitialized<auth::resource> res]
-    : K_ALL K_ROLES { $res = auth::resource(auth::resource_kind::role); }
-    | K_ROLE role = userOrRoleName { $res = auth::make_role_resource(static_cast<const cql3::role_name&>(role).to_string()); }
+      { $res = auth::data_resource($cf.name->get_keyspace(), $cf.name->get_column_family()); }
     ;
 
 /**
  * CREATE USER [IF NOT EXISTS] <username> [WITH PASSWORD <password>] [SUPERUSER|NOSUPERUSER]
  */
-createUserStatement returns [::shared_ptr<create_role_statement> stmt]
+createUserStatement returns [::shared_ptr<create_user_statement> stmt]
     @init {
-        cql3::role_options opts;
-        opts.is_superuser = false;
-        opts.can_login = true;
-
+    	auto opts = ::make_shared<cql3::user_options>();
+        bool superuser = false;
         bool ifNotExists = false;
     }
     : K_CREATE K_USER (K_IF K_NOT K_EXISTS { ifNotExists = true; })? username
-      ( K_WITH K_PASSWORD v=STRING_LITERAL { opts.password = $v.text; })?
-      ( K_SUPERUSER { opts.is_superuser = true; } | K_NOSUPERUSER { opts.is_superuser = false; } )?
-      { $stmt = ::make_shared<create_role_statement>(cql3::role_name($username.text, cql3::preserve_role_case::yes), std::move(opts), ifNotExists); }
+      ( K_WITH userOptions[opts] )?
+      ( K_SUPERUSER { superuser = true; } | K_NOSUPERUSER { superuser = false; } )?
+      { $stmt = ::make_shared<create_user_statement>($username.text, std::move(opts), superuser, ifNotExists); }
     ;
 
 /**
  * ALTER USER <username> [WITH PASSWORD <password>] [SUPERUSER|NOSUPERUSER]
  */
-alterUserStatement returns [::shared_ptr<alter_role_statement> stmt]
+alterUserStatement returns [::shared_ptr<alter_user_statement> stmt]
     @init {
-        cql3::role_options opts;
+    	auto opts = ::make_shared<cql3::user_options>();
+    	std::experimental::optional<bool> superuser;
     }
     : K_ALTER K_USER username
-      ( K_WITH K_PASSWORD v=STRING_LITERAL { opts.password = $v.text; })?
-      ( K_SUPERUSER { opts.is_superuser = true; } | K_NOSUPERUSER { opts.is_superuser = false; } )?
-      { $stmt = ::make_shared<alter_role_statement>(cql3::role_name($username.text, cql3::preserve_role_case::yes), std::move(opts)); }
+      ( K_WITH userOptions[opts] )?
+      ( K_SUPERUSER { superuser = true; } | K_NOSUPERUSER { superuser = false; } )?
+      { $stmt = ::make_shared<alter_user_statement>($username.text, std::move(opts), std::move(superuser)); }
     ;
 
 /**
  * DROP USER [IF EXISTS] <username>
  */
-dropUserStatement returns [::shared_ptr<drop_role_statement> stmt]
+dropUserStatement returns [::shared_ptr<drop_user_statement> stmt]
     @init { bool ifExists = false; }
-    : K_DROP K_USER (K_IF K_EXISTS { ifExists = true; })? username
-      { $stmt = ::make_shared<drop_role_statement>(cql3::role_name($username.text, cql3::preserve_role_case::yes), ifExists); }
+    : K_DROP K_USER (K_IF K_EXISTS { ifExists = true; })? username { $stmt = ::make_shared<drop_user_statement>($username.text, ifExists); }
     ;
 
 /**
@@ -1160,67 +1079,12 @@ listUsersStatement returns [::shared_ptr<list_users_statement> stmt]
     : K_LIST K_USERS { $stmt = ::make_shared<list_users_statement>(); }
     ;
 
-/**
- * CREATE ROLE [IF NOT EXISTS] <role_name> [WITH <roleOption> [AND <roleOption>]*]
- */
-createRoleStatement returns [::shared_ptr<create_role_statement> stmt]
-    @init {
-        cql3::role_options opts;
-        opts.is_superuser = false;
-        opts.can_login = false;
-        bool if_not_exists = false;
-    }
-    : K_CREATE K_ROLE (K_IF K_NOT K_EXISTS { if_not_exists = true; })? name=userOrRoleName
-      (K_WITH roleOptions[opts])?
-      { $stmt = ::make_shared<create_role_statement>(name, std::move(opts), if_not_exists); }
+userOptions[::shared_ptr<cql3::user_options> opts]
+    : userOption[opts]
     ;
 
-/**
- * ALTER ROLE <rolename> [WITH <roleOption> [AND <roleOption>]*]
- */
-alterRoleStatement returns [::shared_ptr<alter_role_statement> stmt]
-    @init {
-        cql3::role_options opts;
-    }
-    : K_ALTER K_ROLE name=userOrRoleName
-      (K_WITH roleOptions[opts])?
-      { $stmt = ::make_shared<alter_role_statement>(name, std::move(opts)); }
-    ;
-
-/**
- * DROP ROLE [IF EXISTS] <rolename>
- */
-dropRoleStatement returns [::shared_ptr<drop_role_statement> stmt]
-    @init {
-        bool if_exists = false;
-    }
-    : K_DROP K_ROLE (K_IF K_EXISTS { if_exists = true; })? name=userOrRoleName
-      { $stmt = ::make_shared<drop_role_statement>(name, if_exists); }
-    ;
-
-/**
- * LIST ROLES [OF <rolename>] [NORECURSIVE]
- */
-listRolesStatement returns [::shared_ptr<list_roles_statement> stmt]
-    @init {
-        bool recursive = true;
-        std::optional<cql3::role_name> grantee;
-    }
-    : K_LIST K_ROLES
-        (K_OF g=userOrRoleName { grantee = std::move(g); })?
-        (K_NORECURSIVE { recursive = false; })?
-        { $stmt = ::make_shared<list_roles_statement>(grantee, recursive); }
-    ;
-
-roleOptions[cql3::role_options& opts]
-    : roleOption[opts] (K_AND roleOption[opts])*
-    ;
-
-roleOption[cql3::role_options& opts]
-    : K_PASSWORD '=' v=STRING_LITERAL { opts.password = $v.text; }
-    | K_OPTIONS '=' m=mapLiteral { opts.options = convert_property_map(m); }
-    | K_SUPERUSER '=' b=BOOLEAN { opts.is_superuser = convert_boolean_literal($b.text); }
-    | K_LOGIN '=' b=BOOLEAN { opts.can_login = convert_boolean_literal($b.text); }
+userOption[::shared_ptr<cql3::user_options> opts]
+    : k=K_PASSWORD v=STRING_LITERAL { opts->put($k.text, $v.text); }
     ;
 
 /** DEFINITIONS **/
@@ -1261,13 +1125,12 @@ userTypeName returns [uninitialized<cql3::ut_name> name]
     : (ks=ident '.')? ut=non_type_ident { $name = cql3::ut_name(ks, ut); }
     ;
 
-userOrRoleName returns [uninitialized<cql3::role_name> name]
-    : t=IDENT              { $name = cql3::role_name($t.text, cql3::preserve_role_case::no); }
-    | t=STRING_LITERAL     { $name = cql3::role_name($t.text, cql3::preserve_role_case::yes); }
-    | t=QUOTED_NAME        { $name = cql3::role_name($t.text, cql3::preserve_role_case::yes); }
-    | k=unreserved_keyword { $name = cql3::role_name(k, cql3::preserve_role_case::no); }
-    | QMARK {add_recognition_error("Bind variables cannot be used for role names");}
+#if 0
+userOrRoleName returns [RoleName name]
+    @init { $name = new RoleName(); }
+    : roleName[name] {return $name;}
     ;
+#endif
 
 ksName[::shared_ptr<cql3::keyspace_element_name> name]
     : t=IDENT              { $name->set_keyspace($t.text, false);}
@@ -1290,6 +1153,15 @@ idxName[::shared_ptr<cql3::index_name> name]
     | QMARK {add_recognition_error("Bind variables cannot be used for index names");}
     ;
 
+#if 0
+roleName[RoleName name]
+    : t=IDENT              { $name.setName($t.text, false); }
+    | t=QUOTED_NAME        { $name.setName($t.text, true); }
+    | k=unreserved_keyword { $name.setName(k, false); }
+    | QMARK {addRecognitionError("Bind variables cannot be used for role names");}
+    ;
+#endif
+
 constant returns [shared_ptr<cql3::constants::literal> constant]
     @init{std::string sign;}
     : t=STRING_LITERAL { $constant = cql3::constants::literal::string(sstring{$t.text}); }
@@ -1559,22 +1431,12 @@ inMarkerForTuple returns [shared_ptr<cql3::tuples::in_raw> marker]
     | ':' name=ident { $marker = new_tuple_in_bind_variables(name); }
     ;
 
-// The comparator_type rule is used for users' queries (internal=false)
-// and for internal calls from db::cql_type_parser::parse() (internal=true).
-// The latter is used for reading schemas stored in the system tables, and
-// may support additional column types that cannot be created through CQL,
-// but only internally through code. Today the only such type is "empty":
-// Scylla code internally creates columns with type "empty" or collections
-// "empty" to represent unselected columns in materialized views.
-// If a user (internal=false) tries to use "empty" as a type, it is treated -
-// as do all unknown types - as an attempt to use a user-defined type, and
-// we report this name is reserved (as for _reserved_type_names()).
-comparator_type [bool internal] returns [shared_ptr<cql3_type::raw> t]
-    : n=native_or_internal_type[internal]     { $t = cql3_type::raw::from(n); }
-    | c=collection_type[internal]   { $t = c; }
-    | tt=tuple_type[internal]       { $t = tt; }
+comparatorType returns [shared_ptr<cql3_type::raw> t]
+    : n=native_type     { $t = cql3_type::raw::from(n); }
+    | c=collection_type { $t = c; }
+    | tt=tuple_type     { $t = tt; }
     | id=userTypeName   { $t = cql3::cql3_type::raw::user_type(id); }
-    | K_FROZEN '<' f=comparator_type[internal] '>'
+    | K_FROZEN '<' f=comparatorType '>'
       {
         try {
             $t = cql3::cql3_type::raw::frozen(f);
@@ -1596,71 +1458,54 @@ comparator_type [bool internal] returns [shared_ptr<cql3_type::raw> t]
 #endif
     ;
 
-native_or_internal_type [bool internal] returns [data_type t]
-    : n=native_type     { $t = n; }
-    // The "internal" types, only supported when internal==true:
-    | K_EMPTY   {
-        if (internal) {
-            $t = empty_type;
-        } else {
-            add_recognition_error("Invalid (reserved) user type name empty");
-        }
-      }
+native_type returns [shared_ptr<cql3_type> t]
+    : K_ASCII     { $t = cql3_type::ascii; }
+    | K_BIGINT    { $t = cql3_type::bigint; }
+    | K_BLOB      { $t = cql3_type::blob; }
+    | K_BOOLEAN   { $t = cql3_type::boolean; }
+    | 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_; }
+    | K_SMALLINT  { $t = cql3_type::smallint; }
+    | K_TEXT      { $t = cql3_type::text; }
+    | K_TIMESTAMP { $t = cql3_type::timestamp; }
+    | K_TINYINT   { $t = cql3_type::tinyint; }
+    | K_UUID      { $t = cql3_type::uuid; }
+    | K_VARCHAR   { $t = cql3_type::varchar; }
+    | K_VARINT    { $t = cql3_type::varint; }
+    | K_TIMEUUID  { $t = cql3_type::timeuuid; }
+    | K_DATE      { $t = cql3_type::date; }
+    | K_TIME      { $t = cql3_type::time; }
     ;
 
-comparatorType returns [shared_ptr<cql3_type::raw> t]
-    : tt=comparator_type[false]    { $t = tt; }
-    ;
-
-native_type returns [data_type t]
-    : K_ASCII     { $t = ascii_type; }
-    | K_BIGINT    { $t = long_type; }
-    | K_BLOB      { $t = bytes_type; }
-    | K_BOOLEAN   { $t = boolean_type; }
-    | K_COUNTER   { $t = counter_type; }
-    | K_DECIMAL   { $t = decimal_type; }
-    | K_DOUBLE    { $t = double_type; }
-    | K_DURATION  { $t = duration_type; }
-    | K_FLOAT     { $t = float_type; }
-    | K_INET      { $t = inet_addr_type; }
-    | K_INT       { $t = int32_type; }
-    | K_SMALLINT  { $t = short_type; }
-    | K_TEXT      { $t = utf8_type; }
-    | K_TIMESTAMP { $t = timestamp_type; }
-    | K_TINYINT   { $t = byte_type; }
-    | K_UUID      { $t = uuid_type; }
-    | K_VARCHAR   { $t = utf8_type; }
-    | K_VARINT    { $t = varint_type; }
-    | K_TIMEUUID  { $t = timeuuid_type; }
-    | K_DATE      { $t = simple_date_type; }
-    | K_TIME      { $t = time_type; }
-    ;
-
-collection_type [bool internal] returns [shared_ptr<cql3::cql3_type::raw> pt]
-    : K_MAP  '<' t1=comparator_type[internal] ',' t2=comparator_type[internal] '>'
+collection_type returns [shared_ptr<cql3::cql3_type::raw> pt]
+    : K_MAP  '<' t1=comparatorType ',' t2=comparatorType '>'
         {
             // if we can't parse either t1 or t2, antlr will "recover" and we may have t1 or t2 null.
             if (t1 && t2) {
                 $pt = cql3::cql3_type::raw::map(t1, t2);
             }
         }
-    | K_LIST '<' t=comparator_type[internal] '>'
+    | K_LIST '<' t=comparatorType '>'
         { if (t) { $pt = cql3::cql3_type::raw::list(t); } }
-    | K_SET  '<' t=comparator_type[internal] '>'
+    | K_SET  '<' t=comparatorType '>'
         { if (t) { $pt = cql3::cql3_type::raw::set(t); } }
     ;
 
-tuple_type [bool internal] returns [shared_ptr<cql3::cql3_type::raw> t]
+tuple_type returns [shared_ptr<cql3::cql3_type::raw> t]
         @init{ std::vector<shared_ptr<cql3::cql3_type::raw>> types; }
     : K_TUPLE '<'
-         t1=comparator_type[internal] { types.push_back(t1); } (',' tn=comparator_type[internal] { types.push_back(tn); })*
+         t1=comparatorType { types.push_back(t1); } (',' tn=comparatorType { types.push_back(tn); })*
       '>' { $t = cql3::cql3_type::raw::tuple(std::move(types)); }
     ;
 
 username
     : IDENT
     | STRING_LITERAL
-    | QUOTED_NAME { add_recognition_error("Quoted strings are not supported for user names"); }
     ;
 
 // Basically the same as cident, but we need to exlude existing CQL3 types
@@ -1679,7 +1524,7 @@ unreserved_keyword returns [sstring str]
 
 unreserved_function_keyword returns [sstring str]
     : u=basic_unreserved_keyword { $str = u; }
-    | t=native_or_internal_type[true]   { $str = t->as_cql3_type().to_string(); }
+    | t=native_type              { $str = t->to_string(); }
     ;
 
 basic_unreserved_keyword returns [sstring str]
@@ -1699,13 +1544,8 @@ basic_unreserved_keyword returns [sstring str]
         | K_ALL
         | K_USER
         | K_USERS
-        | K_ROLE
-        | K_ROLES
         | K_SUPERUSER
         | K_NOSUPERUSER
-        | K_LOGIN
-        | K_NOLOGIN
-        | K_OPTIONS
         | K_PASSWORD
         | K_EXISTS
         | K_CUSTOM
@@ -1725,11 +1565,6 @@ basic_unreserved_keyword returns [sstring str]
         | K_LANGUAGE
         | K_NON
         | K_DETERMINISTIC
-        | K_JSON
-        | K_CACHE
-        | K_BYPASS
-        | K_PER
-        | K_PARTITION
         ) { $str = $k.text; }
     ;
 
@@ -1802,19 +1637,13 @@ K_OF:          O F;
 K_REVOKE:      R E V O K E;
 K_MODIFY:      M O D I F Y;
 K_AUTHORIZE:   A U T H O R I Z E;
-K_DESCRIBE:    D E S C R I B E;
 K_NORECURSIVE: N O R E C U R S I V E;
 
 K_USER:        U S E R;
 K_USERS:       U S E R S;
-K_ROLE:        R O L E;
-K_ROLES:       R O L E S;
 K_SUPERUSER:   S U P E R U S E R;
 K_NOSUPERUSER: N O S U P E R U S E R;
 K_PASSWORD:    P A S S W O R D;
-K_LOGIN:       L O G I N;
-K_NOLOGIN:     N O L O G I N;
-K_OPTIONS:     O P T I O N S;
 
 K_CLUSTERING:  C L U S T E R I N G;
 K_ASCII:       A S C I I;
@@ -1866,17 +1695,6 @@ K_NON:         N O N;
 K_OR:          O R;
 K_REPLACE:     R E P L A C E;
 K_DETERMINISTIC: D E T E R M I N I S T I C;
-K_JSON:        J S O N;
-K_DEFAULT:     D E F A U L T;
-K_UNSET:       U N S E T;
-
-K_EMPTY:       E M P T Y;
-
-K_BYPASS:      B Y P A S S;
-K_CACHE:       C A C H E;
-
-K_PER:         P E R;
-K_PARTITION:   P A R T I T I O N;
 
 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; 

cql3/abstract_marker.cc

@@ -45,7 +45,6 @@
 #include "cql3/lists.hh"
 #include "cql3/maps.hh"
 #include "cql3/sets.hh"
-#include "types/list.hh"
 
 namespace cql3 {
 

cql3/attributes.cc

@@ -77,14 +77,12 @@ int64_t attributes::get_timestamp(int64_t now, const query_options& options) {
     if (tval.is_unset_value()) {
         return now;
     }
-  return with_linearized(*tval, [&] (bytes_view val) {
     try {
-        data_type_for<int64_t>()->validate(val, options.get_cql_serialization_format());
+        data_type_for<int64_t>()->validate(*tval);
     } catch (marshal_exception& e) {
         throw exceptions::invalid_request_exception("Invalid timestamp value");
     }
-    return value_cast<int64_t>(data_type_for<int64_t>()->deserialize(val));
-  });
+    return value_cast<int64_t>(data_type_for<int64_t>()->deserialize(*tval));
 }
 
 int32_t attributes::get_time_to_live(const query_options& options) {
@@ -98,16 +96,14 @@ int32_t attributes::get_time_to_live(const query_options& options) {
     if (tval.is_unset_value()) {
         return 0;
     }
-  auto ttl = with_linearized(*tval, [&] (bytes_view val) {
     try {
-        data_type_for<int32_t>()->validate(val, options.get_cql_serialization_format());
+        data_type_for<int32_t>()->validate(*tval);
     }
     catch (marshal_exception& e) {
         throw exceptions::invalid_request_exception("Invalid TTL value");
     }
 
-    return value_cast<int32_t>(data_type_for<int32_t>()->deserialize(val));
-  });
+    auto ttl = value_cast<int32_t>(data_type_for<int32_t>()->deserialize(*tval));
     if (ttl < 0) {
         throw exceptions::invalid_request_exception("A TTL must be greater or equal to 0");
     }

cql3/attributes.hh

@@ -43,7 +43,7 @@
 
 #include "exceptions/exceptions.hh"
 #include "cql3/term.hh"
-#include <optional>
+#include <experimental/optional>
 
 namespace cql3 {
 /**