chore: add more files to p3 submission (#544)

* chore: add more files to p3 submission

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

* fix

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

* fix

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

---------

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

Author: skyzh

CMakeLists.txt

@@ -341,6 +341,8 @@ set(P3_FILES
         "src/optimizer/optimizer_custom_rules.cpp"
         "src/optimizer/sort_limit_as_topn.cpp"
         "src/optimizer/optimizer_internal.cpp"
+        "src/common/bustub_ddl.cpp"
+        "src/include/execution/plans/index_scan_plan.h"
         ${P2_FILES}
 )
 
@@ -359,7 +361,8 @@ add_custom_target(submit-p3
 set(P4_FILES
         "src/include/concurrency/lock_manager.h"
         "src/concurrency/lock_manager.cpp"
-        "src/include/execution/plans/index_scan_plan.h"
+        "src/include/concurrency/transaction_manager.h"
+        "src/concurrency/transaction_manager.cpp"
         "tools/terrier_bench/terrier_bench_config.h"
         ${P3_FILES}
 )

src/include/execution/plans/seq_scan_plan.h

@@ -58,7 +58,7 @@ class SeqScanPlanNode : public AbstractPlanNode {
   std::string table_name_;
 
   /** The predicate to filter in seqscan. It will ALWAYS be nullptr unless you enable the MergeFilterScan rule.
-      You don't need to handle it to get a perfect score in project 3 / project 4 in Spring 2023.
+      You don't need to handle it to get a perfect score in project 3 in Spring 2023.
   */
   AbstractExpressionRef filter_predicate_;
 

src/include/storage/index/b_plus_tree_index.h

@@ -54,8 +54,8 @@ constexpr static const auto TWO_INTEGER_SIZE = 8;
 using IntegerKeyType = GenericKey<TWO_INTEGER_SIZE>;
 using IntegerValueType = RID;
 using IntegerComparatorType = GenericComparator<TWO_INTEGER_SIZE>;
-using BPlusTreeIndexForOneIntegerColumn = BPlusTreeIndex<IntegerKeyType, IntegerValueType, IntegerComparatorType>;
-using BPlusTreeIndexIteratorForOneIntegerColumn =
+using BPlusTreeIndexForTwoIntegerColumn = BPlusTreeIndex<IntegerKeyType, IntegerValueType, IntegerComparatorType>;
+using BPlusTreeIndexIteratorForTwoIntegerColumn =
     IndexIterator<IntegerKeyType, IntegerValueType, IntegerComparatorType>;
 using IntegerHashFunctionType = HashFunction<IntegerKeyType>;
 

test/sql/p3.17-topn.slt

@@ -1,4 +1,4 @@
-# 6 pts
+# 7 pts
 
 query +ensure:topn
 select * from test_simple_seq_2 order by col1 desc limit 5;

test/sql/p3.leaderboard-q3.slt

@@ -14,23 +14,23 @@ select v, d1, d2 from (
     from __mock_t7 left join (select v4 from __mock_t8 where 1 == 2) on v < v4 group by v
 )
 ----
-19	999999	2999997
-15	999995	2999985
-16	999996	2999988
-14	999994	2999982
-17	999997	2999991
-13	999993	2999979
-18	999998	2999994
-12	999992	2999976
-11	999991	2999973
-10	999990	2999970
-9	999989	2999967
-7	999987	2999961
-8	999988	2999964
-6	999986	2999958
-5	999985	2999955
-3	999983	2999949
-4	999984	2999952
-2	999982	2999946
-1	999981	2999943
-0	999980	2999940
+19 999999 2999997
+15 999995 2999985
+16 999996 2999988
+14 999994 2999982
+17 999997 2999991
+13 999993 2999979
+18 999998 2999994
+12 999992 2999976
+11 999991 2999973
+10 999990 2999970
+9 999989 2999967
+7 999987 2999961
+8 999988 2999964
+6 999986 2999958
+5 999985 2999955
+3 999983 2999949
+4 999984 2999952
+2 999982 2999946
+1 999981 2999943
+0 999980 2999940