From 36575c9565ce59084446e235a97030c801f0d055 Mon Sep 17 00:00:00 2001 From: Alex Chi Date: Thu, 18 Jan 2024 19:59:49 +0800 Subject: [PATCH] update toc Signed-off-by: Alex Chi --- README.md | 9 +++---- mini-lsm-book-wip/src/SUMMARY.md | 24 ++++++++++--------- ...k1-03-memtable.md => week1-01-memtable.md} | 0 .../{week1-01-block.md => week1-02-block.md} | 0 .../src/{week1-02-sst.md => week1-03-sst.md} | 0 ...tions.md => week1-07-sst-optimizations.md} | 0 mini-lsm-book-wip/src/week1-overview.md | 2 +- mini-lsm-book-wip/src/week2-01-compaction.md | 2 +- mini-lsm-book-wip/src/week2-02-simple.md | 1 + mini-lsm-book-wip/src/week2-02-tiered.md | 1 - mini-lsm-book-wip/src/week2-03-leveled.md | 1 - mini-lsm-book-wip/src/week2-03-tiered.md | 1 + mini-lsm-book-wip/src/week2-04-leveled.md | 1 + ...k2-04-manifest.md => week2-05-manifest.md} | 0 .../src/{week2-05-wal.md => week2-06-wal.md} | 0 mini-lsm-book-wip/src/week2-07-batch-write.md | 1 + mini-lsm-book-wip/src/week2-overview.md | 2 +- 17 files changed, 25 insertions(+), 20 deletions(-) rename mini-lsm-book-wip/src/{week1-03-memtable.md => week1-01-memtable.md} (100%) rename mini-lsm-book-wip/src/{week1-01-block.md => week1-02-block.md} (100%) rename mini-lsm-book-wip/src/{week1-02-sst.md => week1-03-sst.md} (100%) rename mini-lsm-book-wip/src/{week2-06-sst-optimizations.md => week1-07-sst-optimizations.md} (100%) create mode 100644 mini-lsm-book-wip/src/week2-02-simple.md delete mode 100644 mini-lsm-book-wip/src/week2-02-tiered.md delete mode 100644 mini-lsm-book-wip/src/week2-03-leveled.md create mode 100644 mini-lsm-book-wip/src/week2-03-tiered.md create mode 100644 mini-lsm-book-wip/src/week2-04-leveled.md rename mini-lsm-book-wip/src/{week2-04-manifest.md => week2-05-manifest.md} (100%) rename mini-lsm-book-wip/src/{week2-05-wal.md => week2-06-wal.md} (100%) create mode 100644 mini-lsm-book-wip/src/week2-07-batch-write.md diff --git a/README.md b/README.md index 675b202..94bfd24 100644 --- a/README.md +++ b/README.md @@ -37,19 +37,20 @@ We are working on a new version of the mini-lsm tutorial that is split into 3 we | Week + Chapter | Topic | Solution | Starter Code | Writeup | | -------------- | ----------------------------------------------- | -------- | ------------ | ------- | -| 1.1 | Block Format | ✅ | ✅ | ✅ | -| 1.2 | Table Format | ✅ | ✅ | ✅ | -| 1.3 | Memtables | ✅ | ✅ | ✅ | +| 1.1 | Memtables | ✅ | ✅ | ✅ | +| 1.2 | Block Format | ✅ | ✅ | ✅ | +| 1.3 | Table Format | ✅ | ✅ | ✅ | | 1.4 | Merge Iterators | ✅ | ✅ | ✅ | | 1.5 | Storage Engine - Read Path | ✅ | ✅ | ✅ | | 1.6 | Storage Engine - Write Path | ✅ | ✅ | ✅ | | 1.7 | Bloom Filter and Key Compression | | | | -| 2.1 | Compaction Introduction | ✅ | 🚧 | 🚧 | +| 2.1 | Compaction Implementation | ✅ | 🚧 | 🚧 | | 2.2 | Compaction Strategy - Simple | ✅ | 🚧 | 🚧 | | 2.3 | Compaction Strategy - Tiered | ✅ | | | | 2.4 | Compaction Strategy - Leveled | ✅ | | | | 2.5 | Manifest | | | | | 2.6 | Write-Ahead Log | | | | +| 2.7 | Batch Write (and preparations for MVCC) | | | | | 3.1 | Timestamp Encoding + Prefix Bloom Filter | | | | | 3.2 | Snapshot Read | | | | | 3.3 | Watermark and Garbage Collection | | | | diff --git a/mini-lsm-book-wip/src/SUMMARY.md b/mini-lsm-book-wip/src/SUMMARY.md index 0662d2f..51b8af9 100644 --- a/mini-lsm-book-wip/src/SUMMARY.md +++ b/mini-lsm-book-wip/src/SUMMARY.md @@ -5,23 +5,25 @@ # Week 1: Mini-LSM -- [Overview](./week1-overview.md) - - [Blocks](./week1-01-block.md) - - [Sorted String Table (SST)](./week1-02-sst.md) - - [Memtables](./week1-03-memtable.md) +- [Week 1 Overview](./week1-overview.md) + - [Memtables](./week1-01-memtable.md) + - [Blocks](./week1-02-block.md) + - [Sorted String Table (SST)](./week1-03-sst.md) - [Merge Iterators](./week1-04-merge-iterator.md) - [Read Path](./week1-05-read-path.md) - [Write Path](./week1-06-write-path.md) + - [Snack Time: SST Optimizations](./week1-07-sst-optimizations.md) # Week 2: Compaction and Persistence -- [Overview](./week2-overview.md) - - [Simple Compaction](./week2-01-compaction.md) - - [Tiered Compaction](./week2-02-tiered.md) - - [Leveled Compaction](./week2-03-leveled.md) - - [Manifest](./week2-04-manifest.md) - - [Write-Ahead Log (WAL)](./week2-05-wal.md) - - [SST Optimizations](./week2-06-sst-optimizations.md) +- [Week 2 Overview](./week2-overview.md) + - [Compaction Implementation](./week2-01-compaction.md) + - [Simple Compaction Strategy](./week2-02-simple.md) + - [Tiered Compaction Strategy](./week2-03-tiered.md) + - [Leveled Compaction Strategy](./week2-04-leveled.md) + - [Manifest](./week2-05-manifest.md) + - [Write-Ahead Log (WAL)](./week2-06-wal.md) + - [Snack Time: Batch Write](./week2-07-batch-write.md) # Week 3: MVCC diff --git a/mini-lsm-book-wip/src/week1-03-memtable.md b/mini-lsm-book-wip/src/week1-01-memtable.md similarity index 100% rename from mini-lsm-book-wip/src/week1-03-memtable.md rename to mini-lsm-book-wip/src/week1-01-memtable.md diff --git a/mini-lsm-book-wip/src/week1-01-block.md b/mini-lsm-book-wip/src/week1-02-block.md similarity index 100% rename from mini-lsm-book-wip/src/week1-01-block.md rename to mini-lsm-book-wip/src/week1-02-block.md diff --git a/mini-lsm-book-wip/src/week1-02-sst.md b/mini-lsm-book-wip/src/week1-03-sst.md similarity index 100% rename from mini-lsm-book-wip/src/week1-02-sst.md rename to mini-lsm-book-wip/src/week1-03-sst.md diff --git a/mini-lsm-book-wip/src/week2-06-sst-optimizations.md b/mini-lsm-book-wip/src/week1-07-sst-optimizations.md similarity index 100% rename from mini-lsm-book-wip/src/week2-06-sst-optimizations.md rename to mini-lsm-book-wip/src/week1-07-sst-optimizations.md diff --git a/mini-lsm-book-wip/src/week1-overview.md b/mini-lsm-book-wip/src/week1-overview.md index 08b7ff5..07dd0c5 100644 --- a/mini-lsm-book-wip/src/week1-overview.md +++ b/mini-lsm-book-wip/src/week1-overview.md @@ -1 +1 @@ -# Storage Format and Simple Engine +# Overview diff --git a/mini-lsm-book-wip/src/week2-01-compaction.md b/mini-lsm-book-wip/src/week2-01-compaction.md index 134827b..c728713 100644 --- a/mini-lsm-book-wip/src/week2-01-compaction.md +++ b/mini-lsm-book-wip/src/week2-01-compaction.md @@ -1 +1 @@ -# Simple Compaction +# Compaction Implementation diff --git a/mini-lsm-book-wip/src/week2-02-simple.md b/mini-lsm-book-wip/src/week2-02-simple.md new file mode 100644 index 0000000..cc80245 --- /dev/null +++ b/mini-lsm-book-wip/src/week2-02-simple.md @@ -0,0 +1 @@ +# Simple Compaction Strategy diff --git a/mini-lsm-book-wip/src/week2-02-tiered.md b/mini-lsm-book-wip/src/week2-02-tiered.md deleted file mode 100644 index 9833b69..0000000 --- a/mini-lsm-book-wip/src/week2-02-tiered.md +++ /dev/null @@ -1 +0,0 @@ -# Tiered Compaction diff --git a/mini-lsm-book-wip/src/week2-03-leveled.md b/mini-lsm-book-wip/src/week2-03-leveled.md deleted file mode 100644 index 6e6892f..0000000 --- a/mini-lsm-book-wip/src/week2-03-leveled.md +++ /dev/null @@ -1 +0,0 @@ -# Leveled Compaction diff --git a/mini-lsm-book-wip/src/week2-03-tiered.md b/mini-lsm-book-wip/src/week2-03-tiered.md new file mode 100644 index 0000000..e559756 --- /dev/null +++ b/mini-lsm-book-wip/src/week2-03-tiered.md @@ -0,0 +1 @@ +# Tiered Compaction Strategy diff --git a/mini-lsm-book-wip/src/week2-04-leveled.md b/mini-lsm-book-wip/src/week2-04-leveled.md new file mode 100644 index 0000000..873534e --- /dev/null +++ b/mini-lsm-book-wip/src/week2-04-leveled.md @@ -0,0 +1 @@ +# Leveled Compaction Strategy diff --git a/mini-lsm-book-wip/src/week2-04-manifest.md b/mini-lsm-book-wip/src/week2-05-manifest.md similarity index 100% rename from mini-lsm-book-wip/src/week2-04-manifest.md rename to mini-lsm-book-wip/src/week2-05-manifest.md diff --git a/mini-lsm-book-wip/src/week2-05-wal.md b/mini-lsm-book-wip/src/week2-06-wal.md similarity index 100% rename from mini-lsm-book-wip/src/week2-05-wal.md rename to mini-lsm-book-wip/src/week2-06-wal.md diff --git a/mini-lsm-book-wip/src/week2-07-batch-write.md b/mini-lsm-book-wip/src/week2-07-batch-write.md new file mode 100644 index 0000000..5821f4b --- /dev/null +++ b/mini-lsm-book-wip/src/week2-07-batch-write.md @@ -0,0 +1 @@ +# Snacks: Batch Write diff --git a/mini-lsm-book-wip/src/week2-overview.md b/mini-lsm-book-wip/src/week2-overview.md index c343e4e..07dd0c5 100644 --- a/mini-lsm-book-wip/src/week2-overview.md +++ b/mini-lsm-book-wip/src/week2-overview.md @@ -1 +1 @@ -# Compaction and Persistence +# Overview