Merge pull request #32 from hnwyllmm/refactor/btree-1

refactor index directory

src/observer/storage/common/table.cpp

@@ -25,8 +25,8 @@ See the Mulan PSL v2 for more details. */
 #include "storage/common/record_manager.h"
 #include "storage/common/condition_filter.h"
 #include "storage/common/meta_util.h"
-#include "storage/common/index.h"
-#include "storage/common/bplus_tree_index.h"
+#include "storage/index/index.h"
+#include "storage/index/bplus_tree_index.h"
 #include "storage/trx/trx.h"
 
 Table::Table() : data_buffer_pool_(nullptr), file_id_(-1), record_handler_(nullptr)

src/observer/storage/default/default_handler.cpp

@@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */
 #include "common/log/log.h"
 #include "common/lang/string.h"
 #include "storage/common/record_manager.h"
-#include "storage/common/bplus_tree.h"
+#include "storage/index/bplus_tree.h"
 #include "storage/common/table.h"
 #include "storage/common/condition_filter.h"
 
@@ -230,4 +230,4 @@ RC DefaultHandler::sync()
     }
   }
   return rc;
-}
\ No newline at end of file
+}

src/observer/storage/common/bplus_tree.cpp → src/observer/storage/index/bplus_tree.cpp

@@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */
 // Created by Xie Meiyi
 // Rewritten by Longda & Wangyunlai
 //
-#include "storage/common/bplus_tree.h"
+#include "storage/index/bplus_tree.h"
 #include "storage/default/disk_buffer_pool.h"
 #include "rc.h"
 #include "common/log/log.h"

src/observer/storage/common/bplus_tree.h → src/observer/storage/index/bplus_tree.h

@@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */
 #include <string.h>
 #include <sstream>
 
-#include "record_manager.h"
+#include "storage/common/record_manager.h"
 #include "storage/default/disk_buffer_pool.h"
 #include "sql/parser/parse_defs.h"
 

src/observer/storage/common/bplus_tree_index.cpp → src/observer/storage/index/bplus_tree_index.cpp

@@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */
 // Created by Meiyi & wangyunlai.wyl on 2021/5/19.
 //
 
-#include "storage/common/bplus_tree_index.h"
+#include "storage/index/bplus_tree_index.h"
 #include "common/log/log.h"
 
 BplusTreeIndex::~BplusTreeIndex() noexcept

src/observer/storage/common/bplus_tree_index.h → src/observer/storage/index/bplus_tree_index.h

@@ -15,8 +15,8 @@ See the Mulan PSL v2 for more details. */
 #ifndef __OBSERVER_STORAGE_COMMON_BPLUS_TREE_INDEX_H_
 #define __OBSERVER_STORAGE_COMMON_BPLUS_TREE_INDEX_H_
 
-#include "storage/common/index.h"
-#include "storage/common/bplus_tree.h"
+#include "storage/index/index.h"
+#include "storage/index/bplus_tree.h"
 
 class BplusTreeIndex : public Index {
 public:

src/observer/storage/common/index.cpp → src/observer/storage/index/index.cpp

@@ -12,11 +12,11 @@ See the Mulan PSL v2 for more details. */
 // Created by Meiyi & wangyunlai.wyl on 2021/5/19.
 //
 
-#include "storage/common/index.h"
+#include "storage/index/index.h"
 
 RC Index::init(const IndexMeta &index_meta, const FieldMeta &field_meta)
 {
   index_meta_ = index_meta;
   field_meta_ = field_meta;
   return RC::SUCCESS;
-}
\ No newline at end of file
+}

unitest/bplus_tree_test.cpp

@@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */
 #include <list>
 #include <iostream>
 
-#include "storage/common/bplus_tree.h"
+#include "storage/index/bplus_tree.h"
 #include "storage/default/disk_buffer_pool.h"
 #include "rc.h"
 #include "common/log/log.h"