// SPDX-License-Identifier: GPL-2.0
#include "bcachefs.h"
#include "bkey_buf.h"
+#include "bkey_cmp.h"
#include "bkey_sort.h"
#include "bset.h"
#include "extents.h"
BUG_ON(!iter->used);
- i->k = bkey_next(i->k);
+ i->k = bkey_p_next(i->k);
BUG_ON(i->k > i->end);
!should_drop_next_key(iter)) {
bkey_copy(out, k);
btree_keys_account_key_add(&nr, 0, out);
- out = bkey_next(out);
+ out = bkey_p_next(out);
}
sort_iter_advance(iter, key_sort_fix_overlapping_cmp);
return nr;
}
-static void extent_sort_append(struct bch_fs *c,
- struct bkey_format *f,
- struct btree_nr_keys *nr,
- struct bkey_packed **out,
- struct bkey_s k)
-{
- if (!bkey_deleted(k.k)) {
- if (!bch2_bkey_pack_key(*out, k.k, f))
- memcpy_u64s_small(*out, k.k, BKEY_U64s);
-
- memcpy_u64s_small(bkeyp_val(f, *out), k.v, bkey_val_u64s(k.k));
-
- btree_keys_account_key_add(nr, 0, *out);
- *out = bkey_next(*out);
- }
-}
-
/* Sort + repack in a new format: */
struct btree_nr_keys
bch2_sort_repack(struct bset *dst, struct btree *src,
struct bkey_format *in_f = &src->format;
struct bkey_packed *in, *out = vstruct_last(dst);
struct btree_nr_keys nr;
+ bool transform = memcmp(out_f, &src->format, sizeof(*out_f));
memset(&nr, 0, sizeof(nr));
if (filter_whiteouts && bkey_deleted(in))
continue;
- if (bch2_bkey_transform(out_f, out, bkey_packed(in)
- ? in_f : &bch2_bkey_format_current, in))
+ if (!transform)
+ bkey_copy(out, in);
+ else if (bch2_bkey_transform(out_f, out, bkey_packed(in)
+ ? in_f : &bch2_bkey_format_current, in))
out->format = KEY_FORMAT_LOCAL_BTREE;
else
bch2_bkey_unpack(src, (void *) out, in);
- btree_keys_account_key_add(&nr, 0, out);
- out = bkey_next(out);
- }
-
- dst->u64s = cpu_to_le16((u64 *) out - dst->_data);
- return nr;
-}
+ out->needs_whiteout = false;
-/* Sort, repack, and call bch2_bkey_normalize() to drop stale pointers: */
-struct btree_nr_keys
-bch2_sort_repack_merge(struct bch_fs *c,
- struct bset *dst, struct btree *src,
- struct btree_node_iter *iter,
- struct bkey_format *out_f,
- bool filter_whiteouts)
-{
- struct bkey_packed *out = vstruct_last(dst), *k_packed;
- struct bkey_buf k;
- struct btree_nr_keys nr;
-
- memset(&nr, 0, sizeof(nr));
- bch2_bkey_buf_init(&k);
-
- while ((k_packed = bch2_btree_node_iter_next_all(iter, src))) {
- if (filter_whiteouts && bkey_deleted(k_packed))
- continue;
-
- /*
- * NOTE:
- * bch2_bkey_normalize may modify the key we pass it (dropping
- * stale pointers) and we don't have a write lock on the src
- * node; we have to make a copy of the entire key before calling
- * normalize
- */
- bch2_bkey_buf_realloc(&k, c, k_packed->u64s + BKEY_U64s);
- bch2_bkey_unpack(src, k.k, k_packed);
-
- if (filter_whiteouts &&
- bch2_bkey_normalize(c, bkey_i_to_s(k.k)))
- continue;
-
- extent_sort_append(c, out_f, &nr, &out, bkey_i_to_s(k.k));
+ btree_keys_account_key_add(&nr, 0, out);
+ out = bkey_p_next(out);
}
dst->u64s = cpu_to_le16((u64 *) out - dst->_data);
- bch2_bkey_buf_exit(&k, c);
return nr;
}
struct bkey_packed *l,
struct bkey_packed *r)
{
- return bch2_bkey_cmp_packed(b, l, r) ?:
+ return bch2_bkey_cmp_packed_inlined(b, l, r) ?:
(int) bkey_deleted(r) - (int) bkey_deleted(l) ?:
(int) l->needs_whiteout - (int) r->needs_whiteout;
}
continue;
while ((next = sort_iter_peek(iter)) &&
- !bch2_bkey_cmp_packed(iter->b, in, next)) {
+ !bch2_bkey_cmp_packed_inlined(iter->b, in, next)) {
BUG_ON(in->needs_whiteout &&
next->needs_whiteout);
needs_whiteout |= in->needs_whiteout;
}
if (bkey_deleted(in)) {
- memcpy_u64s(out, in, bkeyp_key_u64s(f, in));
+ memcpy_u64s_small(out, in, bkeyp_key_u64s(f, in));
set_bkeyp_val_u64s(f, out, 0);
} else {
bkey_copy(out, in);
}
out->needs_whiteout |= needs_whiteout;
- out = bkey_next(out);
+ out = bkey_p_next(out);
}
return (u64 *) out - (u64 *) dst;