database: rename column_family to table

The name "column_family" is both awkward and obsolete. Rename to
the modern and accurate "table".

An alias is kept to avoid huge code churn.

To prevent a One Definition Rule violation, a preexisting "table"
type is moved to a new namespace row_cache_stress_test.

Tests: unit (release)
Message-Id: <20180624065238.26481-1-avi@scylladb.com>

compaction_strategy.hh

@@ -25,7 +25,8 @@
 #include "exceptions/exceptions.hh"
 #include "sstables/compaction_backlog_manager.hh"
 
-class column_family;
+class table;
+using column_family = table;
 class schema;
 using schema_ptr = lw_shared_ptr<const schema>;
 

database.hh

@@ -291,7 +291,10 @@ public:
     friend struct ser::serializer<cache_temperature>;
 };
 
-class column_family : public enable_lw_shared_from_this<column_family> {
+class table;
+using column_family = table;
+
+class table : public enable_lw_shared_from_this<table> {
 public:
     struct config {
         sstring datadir;
@@ -644,14 +647,14 @@ public:
 
     logalloc::occupancy_stats occupancy() const;
 private:
-    column_family(schema_ptr schema, config cfg, db::commitlog* cl, compaction_manager&, cell_locker_stats& cl_stats);
+    table(schema_ptr schema, config cfg, db::commitlog* cl, compaction_manager&, cell_locker_stats& cl_stats);
 public:
-    column_family(schema_ptr schema, config cfg, db::commitlog& cl, compaction_manager& cm, cell_locker_stats& cl_stats)
-        : column_family(schema, std::move(cfg), &cl, cm, cl_stats) {}
-    column_family(schema_ptr schema, config cfg, no_commitlog, compaction_manager& cm, cell_locker_stats& cl_stats)
-        : column_family(schema, std::move(cfg), nullptr, cm, cl_stats) {}
-    column_family(column_family&&) = delete; // 'this' is being captured during construction
-    ~column_family();
+    table(schema_ptr schema, config cfg, db::commitlog& cl, compaction_manager& cm, cell_locker_stats& cl_stats)
+        : table(schema, std::move(cfg), &cl, cm, cl_stats) {}
+    table(schema_ptr schema, config cfg, no_commitlog, compaction_manager& cm, cell_locker_stats& cl_stats)
+        : table(schema, std::move(cfg), nullptr, cm, cl_stats) {}
+    table(column_family&&) = delete; // 'this' is being captured during construction
+    ~table();
     const schema_ptr& schema() const { return _schema; }
     void set_schema(schema_ptr);
     db::commitlog* commitlog() { return _commitlog; }

database_fwd.hh

@@ -23,7 +23,8 @@
 
 // database.hh
 class database;
-class column_family;
+class table;
+using column_family = table;
 class memtable_list;
 
 // mutation.hh

sstables/compaction_manager.hh

@@ -39,7 +39,8 @@
 #include "compaction_backlog_manager.hh"
 #include "backlog_controller.hh"
 
-class column_family;
+class table;
+using column_family = table;
 class compacting_sstable_registration;
 
 // Compaction manager is a feature used to manage compaction jobs from multiple

sstables/compaction_weight_registration.hh

@@ -23,7 +23,6 @@
 #pragma once
 
 class compaction_manager;
-class column_family;
 
 class compaction_weight_registration {
     compaction_manager* _cm;

tests/row_cache_stress_test.cc

@@ -37,6 +37,8 @@ static thread_local bool cancelled = false;
 
 using namespace std::chrono_literals;
 
+namespace row_cache_stress_test {
+
 struct table {
     simple_schema s;
     std::vector<dht::decorated_key> p_keys;
@@ -222,6 +224,10 @@ class monotonic_counter {
     }
 };
 
+}
+
+using namespace row_cache_stress_test;
+
 int main(int argc, char** argv) {
     namespace bpo = boost::program_options;
     app_template app;
@@ -246,7 +252,7 @@ int main(int argc, char** argv) {
             auto rows = app.configuration()["rows"].as<unsigned>();
             auto seconds = app.configuration()["seconds"].as<unsigned>();
 
-            table t(partitions, rows);
+            row_cache_stress_test::table t(partitions, rows);
 
             engine().at_exit([] {
                 cancelled = true;