Skip to content

Commit ad71aac

Browse files
committed
disable size threshold
1 parent 53fdfc5 commit ad71aac

File tree

2 files changed

+34
-30
lines changed

2 files changed

+34
-30
lines changed

src/btreemap/node/v1.rs

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -63,32 +63,34 @@ impl<K: Storable + Ord + Clone> Node<K> {
6363
max_value_size: u32,
6464
memory: &M,
6565
) -> Self {
66-
const LOAD_SIZE_THRESHOLD: u32 = 8;
6766
// Load the entries.
6867
let mut keys_encoded_values = Vec::with_capacity(header.num_entries as usize);
6968
let mut offset = NodeHeader::size();
70-
let mut buf = vec![];
69+
//const LOAD_SIZE_THRESHOLD: u32 = 8;
70+
//let mut buf = vec![];
7171
for _ in 0..header.num_entries {
7272
let key_offset = offset;
73-
let key_size = read_u32(memory, address + offset);
73+
//let key_size = read_u32(memory, address + offset);
7474
offset += U32_SIZE;
75-
let key = if key_size <= LOAD_SIZE_THRESHOLD {
76-
read_to_vec(memory, address + offset, &mut buf, key_size as usize);
77-
LazyKey::by_value(K::from_bytes(Cow::Borrowed(&buf)))
78-
} else {
79-
LazyKey::by_ref(key_offset)
80-
};
75+
// let key = if key_size <= LOAD_SIZE_THRESHOLD {
76+
// read_to_vec(memory, address + offset, &mut buf, key_size as usize);
77+
// LazyKey::by_value(K::from_bytes(Cow::Borrowed(&buf)))
78+
// } else {
79+
// LazyKey::by_ref(key_offset)
80+
// };
81+
let key = LazyKey::by_ref(key_offset);
8182
offset += Bytes::from(max_key_size);
8283

8384
let value_offset = offset;
84-
let value_size = read_u32(memory, address + offset);
85+
// let value_size = read_u32(memory, address + offset);
8586
offset += U32_SIZE;
86-
let value = if value_size <= LOAD_SIZE_THRESHOLD {
87-
read_to_vec(memory, address + offset, &mut buf, value_size as usize);
88-
LazyValue::by_value(buf.to_vec())
89-
} else {
90-
LazyValue::by_ref(value_offset)
91-
};
87+
// let value = if value_size <= LOAD_SIZE_THRESHOLD {
88+
// read_to_vec(memory, address + offset, &mut buf, value_size as usize);
89+
// LazyValue::by_value(buf.to_vec())
90+
// } else {
91+
// LazyValue::by_ref(value_offset)
92+
// };
93+
let value = LazyValue::by_ref(value_offset);
9294
offset += Bytes::from(max_value_size);
9395

9496
keys_encoded_values.push((key, value));

src/btreemap/node/v2.rs

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,10 @@ impl<K: Storable + Ord + Clone> Node<K> {
146146
}
147147
}
148148

149-
const LOAD_SIZE_THRESHOLD: u32 = 8;
150149
// Load the keys.
151150
let mut keys_encoded_values = Vec::with_capacity(num_entries);
152-
let mut buf = vec![];
151+
//const LOAD_SIZE_THRESHOLD: u32 = 8;
152+
//let mut buf = vec![];
153153
for _ in 0..num_entries {
154154
let key_offset = Bytes::from(offset.get());
155155

@@ -164,12 +164,13 @@ impl<K: Storable + Ord + Clone> Node<K> {
164164
offset += U32_SIZE;
165165
key_size
166166
};
167-
let key = if key_size <= LOAD_SIZE_THRESHOLD {
168-
read_to_vec(&reader, offset, &mut buf, key_size as usize);
169-
LazyKey::by_value(K::from_bytes(Cow::Borrowed(&buf)))
170-
} else {
171-
LazyKey::by_ref(key_offset)
172-
};
167+
// let key = if key_size <= LOAD_SIZE_THRESHOLD {
168+
// read_to_vec(&reader, offset, &mut buf, key_size as usize);
169+
// LazyKey::by_value(K::from_bytes(Cow::Borrowed(&buf)))
170+
// } else {
171+
// LazyKey::by_ref(key_offset)
172+
// };
173+
let key = LazyKey::by_ref(key_offset);
173174

174175
// Advance offset by the size of the key.
175176
offset += Bytes::from(key_size);
@@ -182,12 +183,13 @@ impl<K: Storable + Ord + Clone> Node<K> {
182183
let value_offset = Bytes::from(offset.get());
183184
let value_size = read_u32(&reader, offset);
184185
offset += U32_SIZE;
185-
*value = if value_size <= LOAD_SIZE_THRESHOLD {
186-
read_to_vec(&reader, offset, &mut buf, value_size as usize);
187-
LazyValue::by_value(buf.to_vec())
188-
} else {
189-
LazyValue::by_ref(value_offset)
190-
};
186+
// *value = if value_size <= LOAD_SIZE_THRESHOLD {
187+
// read_to_vec(&reader, offset, &mut buf, value_size as usize);
188+
// LazyValue::by_value(buf.to_vec())
189+
// } else {
190+
// LazyValue::by_ref(value_offset)
191+
// };
192+
*value = LazyValue::by_ref(value_offset);
191193
offset += Bytes::from(value_size as u64);
192194
}
193195

0 commit comments

Comments
 (0)