Merge branch 'master' into pr-fix-backward-include-path

README.md

@@ -22,11 +22,11 @@ The following instructions are adapted from the Github documentation on [duplica
 
 1. Go [here](https://github.com/new) to create a new repository under your account. Pick a name (e.g. `bustub-private`) and select **Private** for the repository visibility level.
 2. On your development machine, create a bare clone of the public BusTub repository:
-   ```
+   ```console
    $ git clone --bare https://github.com/cmu-db/bustub.git bustub-public
    ```
 3. Next, [mirror](https://git-scm.com/docs/git-push#Documentation/git-push.txt---mirror) the public BusTub repository to your own private BusTub repository. Suppose your GitHub name is `student` and your repository name is `bustub-private`. The procedure for mirroring the repository is then:
-   ```
+   ```console
    $ cd bustub-public
    
    # If you pull / push over HTTPS
@@ -36,32 +36,32 @@ The following instructions are adapted from the Github documentation on [duplica
    $ git push [email protected]:student/bustub-private.git master
    ```
    This copies everything in the public BusTub repository to your own private repository. You can now delete your local clone of the public repository:
-   ```
+   ```console
    $ cd ..
    $ rm -rf bustub-public
    ```
 4. Clone your private repository to your development machine:
-   ```
+   ```console
    # If you pull / push over HTTPS
    $ git clone https://github.com/student/bustub-private.git
 
    # If you pull / push over SSH
    $ git clone [email protected]:student/bustub-private.git
    ```
 5. Add the public BusTub repository as a second remote. This allows you to retrieve changes from the CMU-DB repository and merge them with your solution throughout the semester:
-   ```
+   ```console
    $ git remote add public https://github.com/cmu-db/bustub.git
    ```
    You can verify that the remote was added with the following command:
-   ```
+   ```console
    $ git remote -v
    origin	https://github.com/student/bustub-private.git (fetch)
    origin	https://github.com/student/bustub-private.git (push)
    public	https://github.com/cmu-db/bustub.git (fetch)
    public	https://github.com/cmu-db/bustub.git (push)
    ```
 6. You can now pull in changes from the public BusTub repository as needed with:
-   ```
+   ```console
    $ git pull public master
    ```
 7. **Disable GitHub Actions** from the project settings of your private repository, otherwise you may run out of GitHub Actions quota.
@@ -80,7 +80,7 @@ Ubuntu 22.04.
 
 To ensure that you have the proper packages on your machine, run the following script to automatically install them:
 
-```
+```console
 # Linux
 $ sudo build_support/packages.sh
 # macOS
@@ -89,7 +89,7 @@ $ build_support/packages.sh
 
 Then run the following commands to build the system:
 
-```
+```console
 $ mkdir build
 $ cd build
 $ cmake ..
@@ -99,15 +99,15 @@ $ make
 If you want to compile the system in debug mode, pass in the following flag to cmake:
 Debug mode:
 
-```
+```console
 $ cmake -DCMAKE_BUILD_TYPE=Debug ..
 $ make -j`nproc`
 ```
 This enables [AddressSanitizer](https://github.com/google/sanitizers) by default.
 
 If you want to use other sanitizers,
 
-```
+```console
 $ cmake -DCMAKE_BUILD_TYPE=Debug -DBUSTUB_SANITIZER=thread ..
 $ make -j`nproc`
 ```

src/include/buffer/buffer_pool_manager.h

@@ -181,7 +181,7 @@ class BufferPoolManager {
 
   /** Array of buffer pool pages. */
   Page *pages_;
-  /** Pointer to the disk sheduler. */
+  /** Pointer to the disk scheduler. */
   std::unique_ptr<DiskScheduler> disk_scheduler_ __attribute__((__unused__));
   /** Pointer to the log manager. Please ignore this for P1. */
   LogManager *log_manager_ __attribute__((__unused__));

src/include/storage/page/extendible_htable_header_page.h

@@ -56,7 +56,7 @@ class ExtendibleHTableHeaderPage {
    * @param directory_idx index in the directory page id array
    * @return directory page_id at index
    */
-  auto GetDirectoryPageId(uint32_t directory_idx) const -> uint32_t;
+  auto GetDirectoryPageId(uint32_t directory_idx) const -> page_id_t;
 
   /**
    * @brief Set the directory page id at an index

src/optimizer/nlj_as_hash_join.cpp

@@ -19,7 +19,7 @@ namespace bustub {
 
 auto Optimizer::OptimizeNLJAsHashJoin(const AbstractPlanNodeRef &plan) -> AbstractPlanNodeRef {
   // TODO(student): implement NestedLoopJoin -> HashJoin optimizer rule
-  // Note for 2023 Fall: You should support join keys of any number of conjunction of equi-condistions:
+  // Note for 2023 Fall: You should support join keys of any number of conjunction of equi-conditions:
   // E.g. <column expr> = <column expr> AND <column expr> = <column expr> AND ...
   return plan;
 }

src/storage/index/CMakeLists.txt

@@ -8,5 +8,5 @@ add_library(
     linear_probe_hash_table_index.cpp)
 
 set(ALL_OBJECT_FILES
-    ${ALL_OBJECT_FILES} $<TARGET_OBJECTS:bustub_storage_disk>
+    ${ALL_OBJECT_FILES} $<TARGET_OBJECTS:bustub_storage_index>
     PARENT_SCOPE)

src/storage/page/extendible_htable_header_page.cpp

@@ -22,7 +22,7 @@ void ExtendibleHTableHeaderPage::Init(uint32_t max_depth) {
 
 auto ExtendibleHTableHeaderPage::HashToDirectoryIndex(uint32_t hash) const -> uint32_t { return 0; }
 
-auto ExtendibleHTableHeaderPage::GetDirectoryPageId(uint32_t directory_idx) const -> uint32_t { return 0; }
+auto ExtendibleHTableHeaderPage::GetDirectoryPageId(uint32_t directory_idx) const -> page_id_t { return 0; }
 
 void ExtendibleHTableHeaderPage::SetDirectoryPageId(uint32_t directory_idx, page_id_t directory_page_id) {
   throw NotImplementedException("ExtendibleHTableHeaderPage is not implemented");

test/txn/txn_abort_serializable_test.cpp

@@ -33,7 +33,7 @@ TEST(TxnBonusTest, DISABLED_SerializableTest) {  // NOLINT
   }
 }
 
-TEST(TxnBonusTest, DISABLE_ConcurrentSerializableTest) {  // NOLINT
+TEST(TxnBonusTest, DISABLED_ConcurrentSerializableTest) {  // NOLINT
   fmt::println(stderr, "--- SerializableTest2: Concurrent Serializable ---");
   {
     for (int i = 0; i < 10; i++) {

test/txn/txn_common.h

@@ -492,7 +492,7 @@ void QueryIndex(BustubInstance &instance, const std::string &txn_var_name, Trans
       }
       if (writer.values_[0] != VecToVecString(expected_rows[i])) {
         fmt::println(stderr, "{} expect {} = {} to be ({}), found ({})", StatusFail("ERROR:"), pk_column,
-                     expected_pk[i], fmt::join(expected_rows[0], ","), fmt::join(writer.values_[0], ","));
+                     expected_pk[i], fmt::join(expected_rows[i], ","), fmt::join(writer.values_[0], ","));
         std::terminate();
       }
     }