From fe0f54849684880977890e36bb5bb7fe0bf4b78e Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Fri, 28 Dec 2018 10:55:57 -0800 Subject: [PATCH] ircd::db: Update / cleanup / comment various opts related. --- include/ircd/db/opts.h | 32 ++++++++++++++++++-------------- ircd/db.cc | 10 ++++++++-- ircd/db.h | 4 ++-- 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/include/ircd/db/opts.h b/include/ircd/db/opts.h index b4ad90b13..ca7f8c142 100644 --- a/include/ircd/db/opts.h +++ b/include/ircd/db/opts.h @@ -34,25 +34,29 @@ namespace ircd::db enum class ircd::db::set :uint64_t { - FSYNC = 0x0001, // Uses kernel filesystem synchronization after write (slow) - NO_JOURNAL = 0x0002, // Write Ahead Log (WAL) for some crash recovery - MISSING_COLUMNS = 0x0004, // No exception thrown when writing to a deleted column family + FSYNC = 0x0001, ///< Uses kernel filesystem synchronization after write (slow). + NO_JOURNAL = 0x0002, ///< Write Ahead Log (WAL) for some crash recovery (danger). + NO_BLOCKING = 0x0004, ///< Fail if write would block. + NO_COLUMN_ERR = 0x0008, ///< No exception thrown when writing to a deleted column. + PRIO_LOW = 0x0010, ///< Mark for low priority behavior. + PRIO_HIGH = 0x0020, ///< Mark for high priority behavior. }; enum class ircd::db::get :uint64_t { - PIN = 0x0001, // Keep iter data in memory for iter lifetime (good for lots of ++/--) - CACHE = 0x0002, // Update the cache (CACHE is default for non-iterator operations) - NO_CACHE = 0x0004, // Do not update the cache (NO_CACHE is default for iterators) - NO_SNAPSHOT = 0x0008, // This iterator will have the latest data (tailing) - CHECKSUM = 0x0010, // Integrity of data will be checked (overrides conf). - NO_CHECKSUM = 0x0020, // Integrity of data will not be checked (overrides conf). - PREFIX = 0x0040, // (prefix_same_as_start); automatic for index columns with pfx - ORDERED = 0x0080, // (total_order_seek); relevant to index columns - NO_PARALLEL = 0x0100, // Don't submit requests in parallel (relevant to db::row) - NO_THROW = 0x0200, // Suppress exceptions if possible. - THROW = 0x0400, // Throw exceptions more than usual. + PIN = 0x0001, ///< Keep iter data in memory for iter lifetime (good for lots ++/--). + PREFIX = 0x0002, ///< (prefix_same_as_start); automatic for index columns with pfx. + ORDERED = 0x0004, ///< (total_order_seek); relevant to index columns. + CACHE = 0x0008, ///< Update the cache. + NO_CACHE = 0x0010, ///< Do not update the cache. + CHECKSUM = 0x0020, ///< Integrity of data will be checked (overrides conf). + NO_CHECKSUM = 0x0040, ///< Integrity of data will not be checked (overrides conf). + NO_BLOCKING = 0x0080, ///< Fail if read would block from not being cached. + NO_SNAPSHOT = 0x0100, ///< This iterator will have the latest data (tailing). + NO_PARALLEL = 0x0200, ///< Don't submit requests in parallel (relevant to db::row). + THROW = 0x0400, ///< Throw exceptions more than usual. + NO_THROW = 0x0800, ///< Suppress exceptions if possible. }; template diff --git a/ircd/db.cc b/ircd/db.cc index d7c58242e..aa4af04fd 100644 --- a/ircd/db.cc +++ b/ircd/db.cc @@ -11359,7 +11359,7 @@ ircd::db::make_opts(const gopts &opts) { rocksdb::ReadOptions ret; assert(ret.fill_cache); - ret.read_tier = BLOCKING; + assert(ret.read_tier == BLOCKING); // slice* for exclusive upper bound. when prefixes are used this value must // have the same prefix because ordering is not guaranteed between prefixes @@ -11398,6 +11398,10 @@ ircd::db::operator+=(rocksdb::ReadOptions &ret, ret.readahead_size = opts.readahead; ret.iter_start_seqnum = opts.seqnum; + ret.read_tier = test(opts, get::NO_BLOCKING)? + rocksdb::ReadTier::kBlockCacheTier: + rocksdb::ReadTier::kReadAllTier; + if(opts.snapshot && !test(opts, get::NO_SNAPSHOT)) ret.snapshot = opts.snapshot; @@ -11419,7 +11423,9 @@ ircd::db::operator+=(rocksdb::WriteOptions &ret, { ret.sync = test(opts, set::FSYNC); ret.disableWAL = test(opts, set::NO_JOURNAL); - ret.ignore_missing_column_families = test(opts, set::MISSING_COLUMNS); + ret.ignore_missing_column_families = test(opts, set::NO_COLUMN_ERR); + ret.no_slowdown = test(opts, set::NO_BLOCKING); + ret.low_pri = test(opts, set::PRIO_LOW); return ret; } diff --git a/ircd/db.h b/ircd/db.h index 3757c0c23..ddacdb1c1 100644 --- a/ircd/db.h +++ b/ircd/db.h @@ -41,8 +41,8 @@ namespace ircd::db struct throw_on_error; struct error_to_status; - const auto BLOCKING = rocksdb::ReadTier::kReadAllTier; - const auto NON_BLOCKING = rocksdb::ReadTier::kBlockCacheTier; + constexpr const auto BLOCKING { rocksdb::ReadTier::kReadAllTier }; + constexpr const auto NON_BLOCKING { rocksdb::ReadTier::kBlockCacheTier }; // state extern log::log rog;