caching_options.hh: move code to .cc

caching_options is by no means performance sensitive, but it is
included in many places (via schema.hh), and it turn it pulls in
other includes. Reduce include load by moving deinlining it.

Ref #1.

Closes #8408

CMakeLists.txt

@@ -314,6 +314,7 @@ set(scylla_sources
     auth/standard_role_manager.cc
     auth/transitional.cc
     bytes.cc
+    caching_options.cc
     canonical_mutation.cc
     cdc/cdc_partitioner.cc
     cdc/generation.cc

caching_options.cc

@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2021 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 "caching_options.hh"
+#include <boost/lexical_cast.hpp>
+#include <map>
+#include "exceptions/exceptions.hh"
+#include "utils/rjson.hh"
+
+caching_options::caching_options(sstring k, sstring r, bool enabled)
+        : _key_cache(k), _row_cache(r), _enabled(enabled) {
+    if ((k != "ALL") && (k != "NONE")) {
+        throw exceptions::configuration_exception("Invalid key value: " + k); 
+    }
+
+    if ((r == "ALL") || (r == "NONE")) {
+        return;
+    } else {
+        try {
+            boost::lexical_cast<unsigned long>(r);
+        } catch (boost::bad_lexical_cast& e) {
+            throw exceptions::configuration_exception("Invalid key value: " + r);
+        }
+    }
+}
+
+caching_options::caching_options()
+        : _key_cache(default_key), _row_cache(default_row) {
+}
+
+std::map<sstring, sstring>
+caching_options::to_map() const {
+    std::map<sstring, sstring> res = {{ "keys", _key_cache },
+            { "rows_per_partition", _row_cache }};
+    if (!_enabled) {
+        res.insert({"enabled", "false"});
+    }
+    return res;
+}
+
+sstring
+caching_options::to_sstring() const {
+    return rjson::print(rjson::from_string_map(to_map()));
+}
+
+caching_options
+caching_options::get_disabled_caching_options() {
+    return caching_options("NONE", "NONE", false);
+}
+
+caching_options
+caching_options::from_map(const std::map<sstring, sstring>& map) {
+    sstring k = default_key;
+    sstring r = default_row;
+    bool e = true;
+
+    for (auto& p : map) {
+        if (p.first == "keys") {
+            k = p.second;
+        } else if (p.first == "rows_per_partition") {
+            r = p.second;
+        } else if (p.first == "enabled") {
+            e = p.second == "true";
+        } else {
+            throw exceptions::configuration_exception(format("Invalid caching option: {}", p.first));
+        }
+    }
+    return caching_options(k, r, e);
+}
+
+caching_options
+caching_options::from_sstring(const sstring& str) {
+    return from_map(rjson::parse_to_map<std::map<sstring, sstring>>(str));
+}
+
+bool
+caching_options::operator==(const caching_options& other) const {
+    return _key_cache == other._key_cache && _row_cache == other._row_cache
+        && _enabled == other._enabled;
+}
+
+bool
+caching_options::operator!=(const caching_options& other) const {
+    return !(*this == other);
+}

caching_options.hh

@@ -21,10 +21,7 @@
 
 #pragma once
 #include <seastar/core/sstring.hh>
-#include <boost/lexical_cast.hpp>
 #include <map>
-#include "exceptions/exceptions.hh"
-#include "utils/rjson.hh"
 #include "seastarx.hh"
 
 class schema;
@@ -41,79 +38,25 @@ class caching_options {
     sstring _key_cache;
     sstring _row_cache;
     bool _enabled = true;
-    caching_options(sstring k, sstring r, bool enabled)
-        : _key_cache(k), _row_cache(r), _enabled(enabled)
-    {
-        if ((k != "ALL") && (k != "NONE")) {
-            throw exceptions::configuration_exception("Invalid key value: " + k); 
-        }
-
-        if ((r == "ALL") || (r == "NONE")) {
-            return;
-        } else {
-            try {
-                boost::lexical_cast<unsigned long>(r);
-            } catch (boost::bad_lexical_cast& e) {
-                throw exceptions::configuration_exception("Invalid key value: " + r);
-            }
-        }
-    }
+    caching_options(sstring k, sstring r, bool enabled);
 
     friend class schema;
-    caching_options() : _key_cache(default_key), _row_cache(default_row) {}
+    caching_options();
 public:
-
     bool enabled() const {
         return _enabled;
     }
 
-    std::map<sstring, sstring> to_map() const {
-        std::map<sstring, sstring> res = {{ "keys", _key_cache },
-                { "rows_per_partition", _row_cache }};
-        if (!_enabled) {
-            res.insert({"enabled", "false"});
-        }
-        return res;
-    }
+    std::map<sstring, sstring> to_map() const;
 
-    sstring to_sstring() const {
-        return rjson::print(rjson::from_string_map(to_map()));
-    }
+    sstring to_sstring() const;
 
-    static caching_options get_disabled_caching_options() {
-        return caching_options("NONE", "NONE", false);
-    }
+    static caching_options get_disabled_caching_options();
+    static caching_options from_map(const std::map<sstring, sstring>& map);
+    static caching_options from_sstring(const sstring& str);
 
-    static caching_options from_map(const std::map<sstring, sstring>& map) {
-        sstring k = default_key;
-        sstring r = default_row;
-        bool e = true;
-
-        for (auto& p : map) {
-            if (p.first == "keys") {
-                k = p.second;
-            } else if (p.first == "rows_per_partition") {
-                r = p.second;
-            } else if (p.first == "enabled") {
-                e = p.second == "true";
-            } else {
-                throw exceptions::configuration_exception(format("Invalid caching option: {}", p.first));
-            }
-        }
-        return caching_options(k, r, e);
-    }
-
-    static caching_options from_sstring(const sstring& str) {
-        return from_map(rjson::parse_to_map<std::map<sstring, sstring>>(str));
-    }
-
-    bool operator==(const caching_options& other) const {
-        return _key_cache == other._key_cache && _row_cache == other._row_cache
-            && _enabled == other._enabled;
-    }
-    bool operator!=(const caching_options& other) const {
-        return !(*this == other);
-    }
+    bool operator==(const caching_options& other) const;
+    bool operator!=(const caching_options& other) const;
 };
 
 

configure.py

@@ -584,6 +584,7 @@ scylla_core = (['database.cc',
                 'absl-flat_hash_map.cc',
                 'table.cc',
                 'atomic_cell.cc',
+                'caching_options.cc',
                 'collection_mutation.cc',
                 'connection_notifier.cc',
                 'hashers.cc',