fix(p3): add in place update to avoid dead loop (#541)

* fix(p3): add in place update to avoid dead loop

Signed-off-by: Alex Chi <[email protected]>

* add update executor to cmakelist

Signed-off-by: Alex Chi <[email protected]>

---------

Signed-off-by: Alex Chi <[email protected]>

Author: skyzh

CMakeLists.txt

@@ -323,6 +323,7 @@ set(P3_FILES
         "src/include/execution/executors/seq_scan_executor.h"
         "src/include/execution/executors/sort_executor.h"
         "src/include/execution/executors/topn_executor.h"
+        "src/include/execution/executors/update_executor.h"
         "src/execution/aggregation_executor.cpp"
         "src/execution/delete_executor.cpp"
         "src/execution/filter_executor.cpp"
@@ -335,6 +336,7 @@ set(P3_FILES
         "src/execution/seq_scan_executor.cpp"
         "src/execution/sort_executor.cpp"
         "src/execution/topn_executor.cpp"
+        "src/execution/update_executor.cpp"
         "src/include/optimizer/optimizer.h"
         "src/include/optimizer/optimizer_internal.h"
         "src/optimizer/nlj_as_hash_join.cpp"
@@ -359,8 +361,6 @@ add_custom_target(submit-p3
 set(P4_FILES
         "src/include/concurrency/lock_manager.h"
         "src/concurrency/lock_manager.cpp"
-        "src/include/execution/executors/update_executor.h"
-        "src/execution/update_executor.cpp"
         "src/include/execution/plans/index_scan_plan.h"
         "tools/terrier_bench/terrier_bench_config.h"
         ${P3_FILES}

src/include/storage/page/table_page.h

@@ -85,6 +85,11 @@ class TablePage {
    */
   auto GetTuple(const RID &rid) const -> std::pair<TupleMeta, Tuple>;
 
+  /**
+   * Update a tuple in place.
+   */
+  void UpdateTupleInPlaceUnsafe(const TupleMeta &meta, const Tuple &tuple, RID rid);
+
   static_assert(sizeof(page_id_t) == 4);
 
  private:

src/include/storage/table/table_heap.h

@@ -71,6 +71,15 @@ class TableHeap {
   /** @return the id of the first page of this table */
   inline auto GetFirstPageId() const -> page_id_t { return first_page_id_; }
 
+  /**
+   * Update a tuple in place. SHOULD BE ONLY USED IN PROJECT 3. Only tuple of the same
+   * size is allowed.
+   * @param meta new tuple meta
+   * @param tuple  new tuple
+   * @param[out] rid the rid of the tuple to be updated
+   */
+  void UpdateTupleInPlaceUnsafe(const TupleMeta &meta, const Tuple &tuple, RID rid);
+
  private:
   BufferPoolManager *bpm_;
   page_id_t first_page_id_{INVALID_PAGE_ID};

src/storage/page/table_page.cpp

@@ -81,4 +81,20 @@ auto TablePage::GetTuple(const RID &rid) const -> std::pair<TupleMeta, Tuple> {
   return std::make_pair(meta, std::move(tuple));
 }
 
+void TablePage::UpdateTupleInPlaceUnsafe(const TupleMeta &meta, const Tuple &tuple, RID rid) {
+  auto tuple_id = rid.GetSlotNum();
+  if (tuple_id >= num_tuples_) {
+    throw bustub::Exception("Tuple ID out of range");
+  }
+  auto &[offset, size, old_meta] = tuple_info_[tuple_id];
+  if (size != tuple.GetLength()) {
+    throw bustub::Exception("Tuple size mismatch");
+  }
+  if (!old_meta.is_deleted_ && meta.is_deleted_) {
+    num_deleted_tuples_++;
+  }
+  tuple_info_[tuple_id] = std::make_tuple(offset, size, meta);
+  memcpy(page_start_ + offset, tuple.data_.data(), tuple.GetLength());
+}
+
 }  // namespace bustub

src/storage/table/table_heap.cpp

@@ -81,4 +81,10 @@ auto TableHeap::GetTuple(RID rid) -> std::pair<TupleMeta, Tuple> {
 
 auto TableHeap::MakeIterator() -> TableIterator { return {this, {first_page_id_, 0}}; }
 
+void TableHeap::UpdateTupleInPlaceUnsafe(const TupleMeta &meta, const Tuple &tuple, RID rid) {
+  auto page_guard = bpm_->FetchPageWrite(rid.GetPageId());
+  auto page = page_guard.AsMut<TablePage>();
+  page->UpdateTupleInPlaceUnsafe(meta, tuple, rid);
+}
+
 }  // namespace bustub