diff --git a/database.cc b/database.cc index 3e2f57ccc4..099229b969 100644 --- a/database.cc +++ b/database.cc @@ -527,6 +527,8 @@ column_family::config keyspace::make_column_family_config(const schema& s) const { column_family::config cfg; cfg.datadir = column_family_directory(s.cf_name(), s.id()); + cfg.enable_disk_reads = _config.enable_disk_reads; + cfg.enable_disk_writes = _config.enable_disk_writes; return cfg; } diff --git a/database.hh b/database.hh index 12369f1757..b05fb40e5b 100644 --- a/database.hh +++ b/database.hh @@ -79,6 +79,8 @@ class column_family { public: struct config { sstring datadir; + bool enable_disk_writes = true; + bool enable_disk_reads = true; }; private: schema_ptr _schema; @@ -150,6 +152,8 @@ class keyspace { public: struct config { sstring datadir; + bool enable_disk_reads = true; + bool enable_disk_writes = true; }; private: std::unique_ptr _replication_strategy; diff --git a/tests/urchin/mutation_test.cc b/tests/urchin/mutation_test.cc index 534d7681cb..e6d024c2ab 100644 --- a/tests/urchin/mutation_test.cc +++ b/tests/urchin/mutation_test.cc @@ -209,6 +209,8 @@ SEASTAR_TEST_CASE(test_multiple_memtables_one_partition) { {{"p1", utf8_type}}, {{"c1", int32_type}}, {{"r1", int32_type}}, {}, utf8_type)); column_family::config cfg; + cfg.enable_disk_reads = false; + cfg.enable_disk_writes = false; column_family cf(s, cfg); const column_definition& r1_col = *s->get_column_definition("r1"); @@ -246,6 +248,8 @@ SEASTAR_TEST_CASE(test_multiple_memtables_multiple_partitions) { {{"p1", int32_type}}, {{"c1", int32_type}}, {{"r1", int32_type}}, {}, utf8_type)); column_family::config cfg; + cfg.enable_disk_reads = false; + cfg.enable_disk_writes = false; column_family cf(s, cfg); std::map> shadow, result;