Skip to content

Commit e744fd1

Browse files
committed
Merge bitcoin/bitcoin#33641: Update leveldb subtree to latest master
f21162d Squashed 'src/leveldb/' changes from aba469ad6a..cad64b151d (fanquake) Pull request description: Rather than continue to close PRs/"Send these upstream" i.e: #33638, #33148, #22664, #13781; just fix the typos. Includes bitcoin-core/leveldb-subtree#57. ACKs for top commit: l0rinc: ACK 54ffe3d cedwies: ACK 54ffe3d stickies-v: ACK 54ffe3d Tree-SHA512: cc4d758ee95a1943f14e800472dfef24d5598a1dfafede32300821bc27e02a80ae97ea12ee87643b395b204262c7bc28e64d421a3d375d46bef7782381fd4362
2 parents 4371740 + 54ffe3d commit e744fd1

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

src/leveldb/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ mkdir build
4949
cd build
5050
cmake -G "Visual Studio 15" ..
5151
```
52-
The default default will build for x86. For 64-bit run:
52+
The default will build for x86. For 64-bit run:
5353

5454
```cmd
5555
cmake -G "Visual Studio 15 Win64" ..

src/leveldb/db/db_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2194,7 +2194,7 @@ TEST(DBTest, Randomized) {
21942194
if (i == 0 || !rnd.OneIn(10)) {
21952195
k = RandomKey(&rnd);
21962196
} else {
2197-
// Periodically re-use the same key from the previous iter, so
2197+
// Periodically reuse the same key from the previous iter, so
21982198
// we have multiple entries in the write batch for the same key
21992199
}
22002200
if (rnd.OneIn(2)) {

src/leveldb/db/snapshot.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class SnapshotImpl : public Snapshot {
2525
friend class SnapshotList;
2626

2727
// SnapshotImpl is kept in a doubly-linked circular list. The SnapshotList
28-
// implementation operates on the next/previous fields direcly.
28+
// implementation operates on the next/previous fields directly.
2929
SnapshotImpl* prev_;
3030
SnapshotImpl* next_;
3131

src/leveldb/doc/benchmark.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ <h1>LevelDB Benchmarks</h1>
8383
<p>Google, July 2011</p>
8484
<hr>
8585

86-
<p>In order to test LevelDB's performance, we benchmark it against other well-established database implementations. We compare LevelDB (revision 39) against <a href="http://www.sqlite.org/">SQLite3</a> (version 3.7.6.3) and <a href="http://fallabs.com/kyotocabinet/spex.html">Kyoto Cabinet's</a> (version 1.2.67) TreeDB (a B+Tree based key-value store). We would like to acknowledge Scott Hess and Mikio Hirabayashi for their suggestions and contributions to the SQLite3 and Kyoto Cabinet benchmarks, respectively.</p>
86+
<p>In order to test LevelDB's performance, we benchmark it against other well-established database implementations. We compare LevelDB (revision 39) against <a href="http://www.sqlite.org/">SQLite3</a> (version 3.7.6.3) and <a href="https://dbmx.net/kyotocabinet/spex.html">Kyoto Cabinet's</a> (version 1.2.67) TreeDB (a B+Tree based key-value store). We would like to acknowledge Scott Hess and Mikio Hirabayashi for their suggestions and contributions to the SQLite3 and Kyoto Cabinet benchmarks, respectively.</p>
8787

8888
<p>Benchmarks were all performed on a six-core Intel(R) Xeon(R) CPU X5650 @ 2.67GHz, with 12288 KB of total L3 cache and 12 GB of DDR3 RAM at 1333 MHz. (Note that LevelDB uses at most two CPUs since the benchmarks are single threaded: one to run the benchmark, and one for background compactions.) We ran the benchmarks on two machines (with identical processors), one with an Ext3 file system and one with an Ext4 file system. The machine with the Ext3 file system has a SATA Hitachi HDS721050CLA362 hard drive. The machine with the Ext4 file system has a SATA Samsung HD502HJ hard drive. Both hard drives spin at 7200 RPM and have hard drive write-caching enabled (using `hdparm -W 1 [device]`). The numbers reported below are the median of three measurements.</p>
8989

src/leveldb/doc/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ sizes.
325325

326326
Each block is individually compressed before being written to persistent
327327
storage. Compression is on by default since the default compression method is
328-
very fast, and is automatically disabled for uncompressible data. In rare cases,
328+
very fast, and is automatically disabled for incompressible data. In rare cases,
329329
applications may want to disable compression entirely, but should only do so if
330330
benchmarks show a performance improvement:
331331

src/leveldb/util/env_posix.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ class PosixMmapReadableFile final : public RandomAccessFile {
218218
// over the ownership of the region.
219219
//
220220
// |mmap_limiter| must outlive this instance. The caller must have already
221-
// aquired the right to use one mmap region, which will be released when this
221+
// acquired the right to use one mmap region, which will be released when this
222222
// instance is destroyed.
223223
PosixMmapReadableFile(std::string filename, char* mmap_base, size_t length,
224224
Limiter* mmap_limiter)
@@ -741,7 +741,7 @@ class PosixEnv : public Env {
741741
// Instances are constructed on the thread calling Schedule() and used on the
742742
// background thread.
743743
//
744-
// This structure is thread-safe beacuse it is immutable.
744+
// This structure is thread-safe because it is immutable.
745745
struct BackgroundWorkItem {
746746
explicit BackgroundWorkItem(void (*function)(void* arg), void* arg)
747747
: function(function), arg(arg) {}

src/leveldb/util/env_windows.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ class WindowsEnv : public Env {
689689
// Instances are constructed on the thread calling Schedule() and used on the
690690
// background thread.
691691
//
692-
// This structure is thread-safe beacuse it is immutable.
692+
// This structure is thread-safe because it is immutable.
693693
struct BackgroundWorkItem {
694694
explicit BackgroundWorkItem(void (*function)(void* arg), void* arg)
695695
: function(function), arg(arg) {}

0 commit comments

Comments
 (0)