Skip to content

Commit e9c0ae9

Browse files
authored
Merge pull request #1432 from kianmeng/fix-typos
Fix typos
2 parents d5e6ce8 + 630d79a commit e9c0ae9

File tree

11 files changed

+17
-17
lines changed

11 files changed

+17
-17
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ challenging to understand why something is failing these intense tests.
4242
For better understanding test failures, please:
4343

4444
1. read the failing test name and output log for clues
45-
1. try to reproduce the failed test locally by running its assocated command from the [test script](https://github.com/spacejam/sled/blob/main/.github/workflows/test.yml)
45+
1. try to reproduce the failed test locally by running its associated command from the [test script](https://github.com/spacejam/sled/blob/main/.github/workflows/test.yml)
4646
1. If it is not clear why your test is failing, feel free to request help with understanding it either on discord or requesting help on the PR, and we will do our best to help.
4747

4848
Want to help sled but don't have time for individual contributions? Contribute via [GitHub Sponsors](https://github.com/sponsors/spacejam) to support the people pushing the project forward!

SAFETY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ These hazards can result in the above losses:
5656
* bugs in the GC system
5757
* the old location is overwritten before the defragmented location becomes durable
5858
* bugs in the recovery system
59-
* hardare failures
59+
* hardware failures
6060
* consistency violations may be caused by
6161
* transaction concurrency control failure to enforce linearizability (strict serializability)
6262
* non-linearizable lock-free single-key operations

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ pub(crate) enum Link {
391391
Set(IVec, IVec),
392392
/// The kv pair at a particular index is removed
393393
Del(IVec),
394-
/// A child of this Index node is marked as mergable
394+
/// A child of this Index node is marked as mergeable
395395
ParentMergeIntention(PageId),
396396
/// The merging child has been completely merged into its left sibling
397397
ParentMergeConfirm,

src/node.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,7 +1088,7 @@ impl Node {
10881088
let pid_bytes = self.index_value(idx);
10891089
let pid = u64::from_le_bytes(pid_bytes.try_into().unwrap());
10901090

1091-
log::trace!("index_next_node for key {:?} returning pid {} after seaching node {:?}", key, pid, self);
1091+
log::trace!("index_next_node for key {:?} returning pid {} after searching node {:?}", key, pid, self);
10921092
(is_leftmost, pid)
10931093
}
10941094

@@ -1749,7 +1749,7 @@ impl Inner {
17491749
// more idiomatic approach of copying the correct number of bytes into
17501750
// a buffer initialized with zeroes. the seemingly "less" unsafe
17511751
// approach of using ptr::copy_nonoverlapping did not improve matters.
1752-
// using a match statement on offest_bytes and performing simpler
1752+
// using a match statement on offset_bytes and performing simpler
17531753
// casting for one or two bytes slowed things down due to increasing
17541754
// code size. this approach is branch-free and cut CPU usage of this
17551755
// function from 7-11% down to 0.5-2% in a monotonic insertion workload.
@@ -2994,7 +2994,7 @@ mod test {
29942994
#[test]
29952995
fn node_bug_01() {
29962996
// postmortem: hi and lo keys were not properly being accounted in the
2997-
// inital allocation
2997+
// initial allocation
29982998
assert!(prop_indexable(vec![], vec![0], vec![],));
29992999
}
30003000

src/pagecache/logger.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ impl Log {
123123
}
124124

125125
/// Tries to claim a reservation for writing a buffer to a
126-
/// particular location in stable storge, which may either be
126+
/// particular location in stable storage, which may either be
127127
/// completed or aborted later. Useful for maintaining
128128
/// linearizability across CAS operations that may need to
129129
/// persist part of their operation.

src/pagecache/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1649,7 +1649,7 @@ impl PageCacheInner {
16491649

16501650
if pid <= COUNTER_PID || pid == BATCH_MANIFEST_PID {
16511651
panic!(
1652-
"tried to do normal pagecache get on priviledged pid {}",
1652+
"tried to do normal pagecache get on privileged pid {}",
16531653
pid
16541654
);
16551655
}

src/pagecache/snapshot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ fn advance_snapshot(
297297
// that point without allocating a new segment
298298
// 4. the recovered tip is at the beginning of a new segment, but without
299299
// any valid messages in it yet. treat as #3 above, but also take care
300-
// in te SA initialization to properly initialize any segment tracking
300+
// in the SA initialization to properly initialize any segment tracking
301301
// state despite not having any pages currently residing there.
302302

303303
let no_recovery_progress = iter.cur_lsn.is_none()

src/subscriber.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ type Senders = Map<usize, (Option<Waker>, SyncSender<OneShot<Option<Event>>>)>;
105105
/// # Ok(())
106106
/// # }
107107
/// ```
108-
/// Aynchronous, non-blocking subscriber:
108+
/// Asynchronous, non-blocking subscriber:
109109
///
110110
/// `Subscription` implements `Future<Output=Option<Event>>`.
111111
///

src/tree.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -937,7 +937,7 @@ impl Tree {
937937
/// should measure the performance impact of
938938
/// using it on realistic sustained workloads
939939
/// running on realistic hardware.
940-
// this clippy check is mis-firing on async code.
940+
// this clippy check is miss-firing on async code.
941941
#[allow(clippy::used_underscore_binding)]
942942
#[allow(clippy::shadow_same)]
943943
pub async fn flush_async(&self) -> Result<usize> {
@@ -979,7 +979,7 @@ impl Tree {
979979
///
980980
/// `[] < [0] < [255] < [255, 0] < [255, 255] ...`
981981
///
982-
/// To retain the ordering of numerical types use big endian reprensentation
982+
/// To retain the ordering of numerical types use big endian representation
983983
///
984984
/// # Examples
985985
///
@@ -1030,7 +1030,7 @@ impl Tree {
10301030
///
10311031
/// `[] < [0] < [255] < [255, 0] < [255, 255] ...`
10321032
///
1033-
/// To retain the ordering of numerical types use big endian reprensentation
1033+
/// To retain the ordering of numerical types use big endian representation
10341034
///
10351035
/// # Examples
10361036
///

tests/test_tree.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1732,7 +1732,7 @@ fn tree_bug_22() {
17321732
#[test]
17331733
#[cfg_attr(miri, ignore)]
17341734
fn tree_bug_23() {
1735-
// postmortem: when rewriting CRC handling code, mis-sized the blob crc
1735+
// postmortem: when rewriting CRC handling code, miss-sized the blob crc
17361736
prop_tree_matches_btreemap(
17371737
vec![Set(Key(vec![6; 5120]), 92), Restart, Scan(Key(vec![]), 35)],
17381738
false,
@@ -2543,8 +2543,8 @@ fn tree_bug_39() {
25432543
#[test]
25442544
#[cfg_attr(miri, ignore)]
25452545
fn tree_bug_40() {
2546-
// postmortem: deletions of non-existant keys were
2547-
// being persisted despite being unneccessary.
2546+
// postmortem: deletions of non-existent keys were
2547+
// being persisted despite being unnecessary.
25482548
prop_tree_matches_btreemap(
25492549
vec![Del(Key(vec![99; 111222333]))],
25502550
false,

0 commit comments

Comments
 (0)