Skip to content

Commit d313b3a

Browse files
zhscnMatan-B
zhscn
authored and
Matan-B
committed
crimson/os/seastore/lba: flatten lba namespace to keep consistent with backref
Signed-off-by: Zhang Song <[email protected]> (cherry picked from commit 4593e51)
1 parent 89d1065 commit d313b3a

19 files changed

+67
-68
lines changed

‎src/crimson/os/seastore/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ set(crimson_seastore_srcs
1515
btree/btree_types.cc
1616
backref_manager.cc
1717
backref/btree_backref_manager.cc
18-
lba_manager/btree/btree_lba_manager.cc
19-
lba_manager/btree/lba_btree_node.cc
18+
lba/btree_lba_manager.cc
19+
lba/lba_btree_node.cc
2020
omap_manager.cc
2121
omap_manager/btree/btree_omap_manager.cc
2222
omap_manager/btree/omap_btree_node_impl.cc

‎src/crimson/os/seastore/btree/btree_types.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
// vim: ts=8 sw=2 smarttab
33

44
#include "crimson/os/seastore/btree/btree_types.h"
5-
#include "crimson/os/seastore/lba_manager/btree/lba_btree_node.h"
5+
#include "crimson/os/seastore/lba/lba_btree_node.h"
66
#include "crimson/os/seastore/backref/backref_tree_node.h"
77

88
namespace crimson::os::seastore {
99

10-
namespace lba_manager::btree {
10+
namespace lba {
1111

1212
std::ostream& operator<<(std::ostream& out, const lba_map_val_t& v)
1313
{
@@ -19,7 +19,7 @@ std::ostream& operator<<(std::ostream& out, const lba_map_val_t& v)
1919
<< ")";
2020
}
2121

22-
} // namespace lba_manager::btree
22+
} // namespace lba
2323

2424
namespace backref {
2525

@@ -36,7 +36,7 @@ namespace {
3636
template <typename key_t, typename T>
3737
bool modified_since(T &&extent, uint64_t iter_modifications) {
3838
using backref::BackrefLeafNode;
39-
using lba_manager::btree::LBALeafNode;
39+
using lba::LBALeafNode;
4040
if constexpr (std::is_same_v<key_t, laddr_t>) {
4141
assert(extent->get_type() == extent_types_t::LADDR_LEAF);
4242
auto leaf = extent->template cast<LBALeafNode>();
@@ -64,7 +64,7 @@ bool BtreeCursor<key_t, val_t>::is_viewable() const {
6464
return viewable;
6565
}
6666

67-
template struct BtreeCursor<laddr_t, lba_manager::btree::lba_map_val_t>;
67+
template struct BtreeCursor<laddr_t, lba::lba_map_val_t>;
6868
template struct BtreeCursor<paddr_t, backref::backref_map_val_t>;
6969

7070
} // namespace crimson::os::seastore

‎src/crimson/os/seastore/btree/btree_types.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ struct __attribute__((packed)) fixed_kv_node_meta_le_t {
100100
}
101101
};
102102

103-
namespace lba_manager::btree {
103+
namespace lba {
104104

105105
/**
106106
* lba_map_val_t
@@ -150,7 +150,7 @@ struct __attribute__((packed)) lba_map_val_le_t {
150150
}
151151
};
152152

153-
} // namespace lba_manager::btree
153+
} // namespace lba
154154

155155
namespace backref {
156156

@@ -216,7 +216,7 @@ struct BtreeCursor {
216216
pos(pos)
217217
{
218218
if constexpr (std::is_same_v<key_t, laddr_t>) {
219-
static_assert(std::is_same_v<val_t, lba_manager::btree::lba_map_val_t>,
219+
static_assert(std::is_same_v<val_t, lba::lba_map_val_t>,
220220
"the value type of laddr_t for BtreeCursor should be lba_map_val_t");
221221
} else {
222222
static_assert(std::is_same_v<key_t, paddr_t>,
@@ -251,8 +251,8 @@ struct BtreeCursor {
251251
}
252252
};
253253

254-
struct LBACursor : BtreeCursor<laddr_t, lba_manager::btree::lba_map_val_t> {
255-
using Base = BtreeCursor<laddr_t, lba_manager::btree::lba_map_val_t>;
254+
struct LBACursor : BtreeCursor<laddr_t, lba::lba_map_val_t> {
255+
using Base = BtreeCursor<laddr_t, lba::lba_map_val_t>;
256256
using Base::BtreeCursor;
257257
bool is_indirect() const {
258258
assert(!is_end());

‎src/crimson/os/seastore/btree/fixed_kv_btree.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ class FixedKVBtree {
178178
assert(!is_end());
179179
auto ret = leaf.node->iter_idx(leaf.pos).get_val();
180180
if constexpr (
181-
std::is_same_v<crimson::os::seastore::lba_manager::btree::lba_map_val_t,
181+
std::is_same_v<crimson::os::seastore::lba::lba_map_val_t,
182182
node_val_t>) {
183183
if (ret.pladdr.is_paddr()) {
184184
ret.pladdr = ret.pladdr.get_paddr().maybe_relative_to(

‎src/crimson/os/seastore/cache.cc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
// included for get_extent_by_type
1616
#include "crimson/os/seastore/collection_manager/collection_flat_node.h"
17-
#include "crimson/os/seastore/lba_manager/btree/lba_btree_node.h"
17+
#include "crimson/os/seastore/lba/lba_btree_node.h"
1818
#include "crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.h"
1919
#include "crimson/os/seastore/object_data_handler.h"
2020
#include "crimson/os/seastore/collection_manager/collection_flat_node.h"
@@ -1090,9 +1090,9 @@ CachedExtentRef Cache::alloc_new_non_data_extent_by_type(
10901090
ceph_assert(0 == "ROOT is never directly alloc'd");
10911091
return CachedExtentRef();
10921092
case extent_types_t::LADDR_INTERNAL:
1093-
return alloc_new_non_data_extent<lba_manager::btree::LBAInternalNode>(t, length, hint, gen);
1093+
return alloc_new_non_data_extent<lba::LBAInternalNode>(t, length, hint, gen);
10941094
case extent_types_t::LADDR_LEAF:
1095-
return alloc_new_non_data_extent<lba_manager::btree::LBALeafNode>(
1095+
return alloc_new_non_data_extent<lba::LBALeafNode>(
10961096
t, length, hint, gen);
10971097
case extent_types_t::ROOT_META:
10981098
return alloc_new_non_data_extent<RootMetaBlock>(
@@ -1449,7 +1449,7 @@ record_t Cache::prepare_record(
14491449
if (i->is_logical()) {
14501450
fresh_laddr = i->cast<LogicalCachedExtent>()->get_laddr();
14511451
} else if (is_lba_node(i->get_type())) {
1452-
fresh_laddr = i->cast<lba_manager::btree::LBANode>()->get_node_meta().begin;
1452+
fresh_laddr = i->cast<lba::LBANode>()->get_node_meta().begin;
14531453
} else {
14541454
fresh_laddr = L_ADDR_NULL;
14551455
}
@@ -1468,7 +1468,7 @@ record_t Cache::prepare_record(
14681468
if (i->is_logical()) {
14691469
alloc_laddr = i->cast<LogicalCachedExtent>()->get_laddr();
14701470
} else if (is_lba_node(i->get_type())) {
1471-
alloc_laddr = i->cast<lba_manager::btree::LBANode>()->get_node_meta().begin;
1471+
alloc_laddr = i->cast<lba::LBANode>()->get_node_meta().begin;
14721472
} else {
14731473
assert(i->get_type() == extent_types_t::TEST_BLOCK_PHYSICAL);
14741474
alloc_laddr = L_ADDR_MIN;
@@ -1494,7 +1494,7 @@ record_t Cache::prepare_record(
14941494
alloc_laddr = i->cast<LogicalCachedExtent>()->get_laddr();
14951495
} else {
14961496
assert(is_lba_node(i->get_type()));
1497-
alloc_laddr = i->cast<lba_manager::btree::LBANode>()->get_node_meta().begin;
1497+
alloc_laddr = i->cast<lba::LBANode>()->get_node_meta().begin;
14981498
}
14991499
alloc_delta.alloc_blk_ranges.emplace_back(
15001500
alloc_blk_t::create_alloc(
@@ -1808,7 +1808,7 @@ void Cache::complete_commit(
18081808
if (i->is_logical()) {
18091809
alloc_laddr = i->cast<LogicalCachedExtent>()->get_laddr();
18101810
} else if (is_lba_node(i->get_type())) {
1811-
alloc_laddr = i->cast<lba_manager::btree::LBANode>()->get_node_meta().begin;
1811+
alloc_laddr = i->cast<lba::LBANode>()->get_node_meta().begin;
18121812
} else {
18131813
assert(i->get_type() == extent_types_t::TEST_BLOCK_PHYSICAL);
18141814
alloc_laddr = L_ADDR_MIN;
@@ -2253,13 +2253,13 @@ Cache::do_get_caching_extent_by_type(
22532253
return CachedExtentRef(extent.detach(), false /* add_ref */);
22542254
});
22552255
case extent_types_t::LADDR_INTERNAL:
2256-
return do_get_caching_extent<lba_manager::btree::LBAInternalNode>(
2256+
return do_get_caching_extent<lba::LBAInternalNode>(
22572257
offset, length, std::move(extent_init_func), std::move(on_cache), p_src
22582258
).safe_then([](auto extent) {
22592259
return CachedExtentRef(extent.detach(), false /* add_ref */);
22602260
});
22612261
case extent_types_t::LADDR_LEAF:
2262-
return do_get_caching_extent<lba_manager::btree::LBALeafNode>(
2262+
return do_get_caching_extent<lba::LBALeafNode>(
22632263
offset, length, std::move(extent_init_func), std::move(on_cache), p_src
22642264
).safe_then([](auto extent) {
22652265
return CachedExtentRef(extent.detach(), false /* add_ref */);

src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc renamed to src/crimson/os/seastore/lba/btree_lba_manager.cc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#include <seastar/core/metrics.hh>
88

99
#include "include/buffer.h"
10-
#include "crimson/os/seastore/lba_manager/btree/btree_lba_manager.h"
11-
#include "crimson/os/seastore/lba_manager/btree/lba_btree_node.h"
10+
#include "crimson/os/seastore/lba/btree_lba_manager.h"
11+
#include "crimson/os/seastore/lba/lba_btree_node.h"
1212
#include "crimson/os/seastore/logging.h"
1313

1414
SET_SUBSYS(seastore_lba);
@@ -20,10 +20,10 @@ SET_SUBSYS(seastore_lba);
2020
*/
2121

2222
template <> struct fmt::formatter<
23-
crimson::os::seastore::lba_manager::btree::LBABtree::iterator>
23+
crimson::os::seastore::lba::LBABtree::iterator>
2424
: public fmt::formatter<std::string_view>
2525
{
26-
using Iter = crimson::os::seastore::lba_manager::btree::LBABtree::iterator;
26+
using Iter = crimson::os::seastore::lba::LBABtree::iterator;
2727

2828
template <typename FmtCtx>
2929
auto format(const Iter &iter, FmtCtx &ctx) const
@@ -45,7 +45,7 @@ Transaction::tree_stats_t& get_tree_stats(Transaction &t)
4545

4646
template Transaction::tree_stats_t&
4747
get_tree_stats<
48-
crimson::os::seastore::lba_manager::btree::LBABtree>(
48+
crimson::os::seastore::lba::LBABtree>(
4949
Transaction &t);
5050

5151
template <typename T>
@@ -56,11 +56,11 @@ phy_tree_root_t& get_phy_tree_root(root_t &r)
5656

5757
template phy_tree_root_t&
5858
get_phy_tree_root<
59-
crimson::os::seastore::lba_manager::btree::LBABtree>(root_t &r);
59+
crimson::os::seastore::lba::LBABtree>(root_t &r);
6060

6161
template <>
6262
const get_phy_tree_root_node_ret get_phy_tree_root_node<
63-
crimson::os::seastore::lba_manager::btree::LBABtree>(
63+
crimson::os::seastore::lba::LBABtree>(
6464
const RootBlockRef &root_block, op_context_t c)
6565
{
6666
auto lba_root = root_block->lba_root_node;
@@ -98,12 +98,12 @@ class TreeRootLinker<RootBlock, RootT> {
9898
}
9999
};
100100

101-
template class TreeRootLinker<RootBlock, lba_manager::btree::LBAInternalNode>;
102-
template class TreeRootLinker<RootBlock, lba_manager::btree::LBALeafNode>;
101+
template class TreeRootLinker<RootBlock, lba::LBAInternalNode>;
102+
template class TreeRootLinker<RootBlock, lba::LBALeafNode>;
103103

104104
}
105105

106-
namespace crimson::os::seastore::lba_manager::btree {
106+
namespace crimson::os::seastore::lba {
107107

108108
BtreeLBAManager::mkfs_ret
109109
BtreeLBAManager::mkfs(

src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h renamed to src/crimson/os/seastore/lba/btree_lba_manager.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
#include "crimson/os/seastore/lba_manager.h"
2121
#include "crimson/os/seastore/cache.h"
2222

23-
#include "crimson/os/seastore/lba_manager/btree/lba_btree_node.h"
23+
#include "crimson/os/seastore/lba/lba_btree_node.h"
2424
#include "crimson/os/seastore/btree/btree_types.h"
2525

2626
namespace crimson::os::seastore {
2727
class LogicalCachedExtent;
2828
}
2929

30-
namespace crimson::os::seastore::lba_manager::btree {
30+
namespace crimson::os::seastore::lba {
3131

3232
using LBABtree = FixedKVBtree<
3333
laddr_t, lba_map_val_t, LBAInternalNode,

src/crimson/os/seastore/lba_manager/btree/lba_btree_node.cc renamed to src/crimson/os/seastore/lba/lba_btree_node.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
#include "include/buffer.h"
1111
#include "include/byteorder.h"
1212

13-
#include "crimson/os/seastore/lba_manager/btree/btree_lba_manager.h"
13+
#include "crimson/os/seastore/lba/btree_lba_manager.h"
1414
#include "crimson/os/seastore/logging.h"
1515
#include "crimson/os/seastore/logical_child_node.h"
1616

1717
SET_SUBSYS(seastore_lba);
1818

19-
namespace crimson::os::seastore::lba_manager::btree {
19+
namespace crimson::os::seastore::lba {
2020

2121
std::ostream &LBALeafNode::print_detail(std::ostream &out) const
2222
{

src/crimson/os/seastore/lba_manager/btree/lba_btree_node.h renamed to src/crimson/os/seastore/lba/lba_btree_node.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace crimson::os::seastore {
2424
class LogicalChildNode;
2525
}
2626

27-
namespace crimson::os::seastore::lba_manager::btree {
27+
namespace crimson::os::seastore::lba {
2828

2929
using base_iertr = Cache::base_iertr;
3030
using LBANode = FixedKVNode<laddr_t>;
@@ -284,8 +284,8 @@ using LBALeafNodeRef = TCachedExtentRef<LBALeafNode>;
284284
}
285285

286286
#if FMT_VERSION >= 90000
287-
template <> struct fmt::formatter<crimson::os::seastore::lba_manager::btree::lba_node_meta_t> : fmt::ostream_formatter {};
288-
template <> struct fmt::formatter<crimson::os::seastore::lba_manager::btree::lba_map_val_t> : fmt::ostream_formatter {};
289-
template <> struct fmt::formatter<crimson::os::seastore::lba_manager::btree::LBAInternalNode> : fmt::ostream_formatter {};
290-
template <> struct fmt::formatter<crimson::os::seastore::lba_manager::btree::LBALeafNode> : fmt::ostream_formatter {};
287+
template <> struct fmt::formatter<crimson::os::seastore::lba::lba_node_meta_t> : fmt::ostream_formatter {};
288+
template <> struct fmt::formatter<crimson::os::seastore::lba::lba_map_val_t> : fmt::ostream_formatter {};
289+
template <> struct fmt::formatter<crimson::os::seastore::lba::LBAInternalNode> : fmt::ostream_formatter {};
290+
template <> struct fmt::formatter<crimson::os::seastore::lba::LBALeafNode> : fmt::ostream_formatter {};
291291
#endif

‎src/crimson/os/seastore/lba_manager.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
// vim: ts=8 sw=2 smarttab
33

44
#include "crimson/os/seastore/lba_manager.h"
5-
#include "crimson/os/seastore/lba_manager/btree/btree_lba_manager.h"
5+
#include "crimson/os/seastore/lba/btree_lba_manager.h"
66

77
namespace crimson::os::seastore {
88

9-
LBAManagerRef lba_manager::create_lba_manager(Cache &cache) {
10-
return LBAManagerRef(new btree::BtreeLBAManager(cache));
9+
LBAManagerRef lba::create_lba_manager(Cache &cache) {
10+
return LBAManagerRef(new lba::BtreeLBAManager(cache));
1111
}
1212

1313
}

0 commit comments

Comments
 (0)