Merge branch 'dev_layer2_merge' into layer2_hcg

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: build
 
 on:
   push:
-    branches: [ "main" , "dev_cy"]
+    branches: [ "main" , "*"]
   pull_request:
     branches: [ "main" ]
 

CMakeLists.txt

@@ -13,7 +13,7 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 OPTION(ENABLE_ASAN "Enable build with address sanitizer" ON)
 OPTION(ENABLE_TSAN "Build with thread sanitizer" OFF)
 OPTION(ENABLE_UBSAN "Build with undefined behavior sanitizer" OFF)
-OPTION(WITH_UNIT_TESTS "Compile miniob with unit tests" ON)
+OPTION(WITH_UNIT_TESTS "Compile miniob with unit tests" OFF)
 OPTION(WITH_BENCHMARK "Compile benchmark" OFF)
 OPTION(ENABLE_COVERAGE "Enable unittest coverage" OFF)
 OPTION(CONCURRENCY "Support concurrency operations" OFF)
@@ -39,7 +39,8 @@ ELSE()
 ENDIF(WIN32)
 
 # This is for clangd plugin for vscode
-SET(CMAKE_COMMON_FLAGS "${CMAKE_COMMON_FLAGS} -Wall -Werror")
+SET(CMAKE_COMMON_FLAGS "${CMAKE_COMMON_FLAGS} -Wall")
+# SET(CMAKE_COMMON_FLAGS "${CMAKE_COMMON_FLAGS} -Wall -Werror")
 IF(DEBUG)
     MESSAGE(STATUS "DEBUG has been set as TRUE ${DEBUG}")
     SET(CMAKE_COMMON_FLAGS "${CMAKE_COMMON_FLAGS}  -O0 -g -DDEBUG ")
@@ -151,7 +152,7 @@ IF (WITH_BENCHMARK)
     ADD_SUBDIRECTORY(benchmark)
 ENDIF(WITH_BENCHMARK)
 
-IF(WITH_UNIT_TESTS)
-    ADD_SUBDIRECTORY(unittest)
-ENDIF(WITH_UNIT_TESTS)
+# IF(WITH_UNIT_TESTS)
+#     ADD_SUBDIRECTORY(unittest)
+# ENDIF(WITH_UNIT_TESTS)
 

deps/common/lang/comparator.cpp

@@ -13,6 +13,7 @@ See the Mulan PSL v2 for more details. */
 //
 
 #include "common/defs.h"
+#include "common/log/log.h"
 #include <algorithm>
 #include <string.h>
 
@@ -22,6 +23,7 @@ int compare_int(void *arg1, void *arg2)
 {
   int v1 = *(int *)arg1;
   int v2 = *(int *)arg2;
+  LOG_DEBUG("[[[compare_int]]] value1:%d, value2:%d",v1,v2);
   if (v1 > v2) {
     return 1;
   } else if (v1 < v2) {

deps/common/lang/lower_bound.h

@@ -60,6 +60,107 @@ ForwardIterator lower_bound(
   return first;
 }
 
+template <typename ForwardIterator, typename T, typename Compare>
+ForwardIterator lower_bound_v2_advanced(ForwardIterator first, ForwardIterator last, const T &val, Compare comp,
+    bool *_found = nullptr, bool is_unique = true)
+{
+  bool            found = false;
+  ForwardIterator iter;
+  const auto      count      = std::distance(first, last);
+  auto            last_count = count;
+  while (last_count > 0) {
+    iter      = first;
+    auto step = last_count / 2;
+    std::advance(iter, step);
+    LOG_DEBUG("[[[I'm Here Here]]]");
+    int result = comp(*iter, val, is_unique);
+    if (0 == result) {
+      first = iter;
+      found = true;
+      break;
+    }
+    if (result < 0) {
+      first = ++iter;
+      last_count -= step + 1;
+    } else {
+      last_count = step;
+    }
+  }
+
+  if (_found) {
+    *_found = found;
+  }
+  return first;
+}
+
+// 以下两种方案都不行。为什么不行：没有理解索引，B+树索引真正的本质；错在哪了：应该在找到对应的页面后，在那个小块内进行检索，而不是全盘检索，那样还不如直接O(n)简单呢，也就是为什么要用B+树
+template <typename ForwardIterator, typename T, typename Compare>
+ForwardIterator lower_bound_v2(ForwardIterator first, ForwardIterator last, const T &val, Compare comp,
+    bool *_found = nullptr, const std::vector<FieldMeta> &key_field_meta = {})
+{
+  bool            found = false;
+  ForwardIterator iter;
+  const auto      count      = std::distance(first, last);
+  auto            last_count = count;
+  while (last_count > 0) {
+    iter      = first;
+    auto step = last_count / 2;
+    std::advance(iter, step);
+    int result     = comp(*iter, val);                  // 按照RID寻找
+    int unique_res = comp(*iter, val, key_field_meta);  // 按照record value寻找
+    if (0 == result || unique_res == 0) {
+      first = iter;
+      found = true;
+      break;
+    }
+    if (result < 0) {
+      first = ++iter;
+      last_count -= step + 1;
+    } else {
+      last_count = step;
+    }
+  }
+
+  if (_found) {
+    *_found = found;
+  }
+  return first;
+}
+
+template <typename ForwardIterator, typename T, typename Compare>
+ForwardIterator lower_bound_with_record(ForwardIterator first, ForwardIterator last, const T &val, Compare comp,
+    bool *_found = nullptr, const std::vector<FieldMeta> &key_field_meta = {})
+{
+  LOG_DEBUG("[[[[[[[[[[[[[I am here too]]]]]]]]]]]]]");
+  bool            found = false;
+  ForwardIterator iter;
+  const auto      count      = std::distance(first, last);
+  auto            last_count = count;
+  while (last_count > 0) {
+    iter      = first;
+    auto step = last_count / 2;
+    std::advance(iter, step);
+    int result = comp(*iter, val, key_field_meta);
+    LOG_DEBUG("[[[[[[[[[[[[[found found found]]]]]]]]]]]]] %d",result);
+    if (0 == result) {
+      first = iter;
+      found = true;
+      break;
+    }
+    if (result < 0) {
+      first = ++iter;
+      last_count -= step + 1;
+    } else {
+      last_count = step;
+    }
+  }
+
+  if (_found) {
+    *_found = found;
+  }
+  return first;
+}
+
 template <typename T>
 class Comparator
 {
@@ -111,7 +212,7 @@ class BinaryIterator
   BinaryIterator  operator++(int)
   {
     BinaryIterator tmp(*this);
-    this->         operator++();
+    this->operator++();
     return tmp;
   }
   BinaryIterator &operator--() { return this->operator+=(-1); }

src/observer/sql/executor/create_index_executor.cpp

@@ -30,7 +30,7 @@ RC CreateIndexExecutor::execute(SQLStageEvent *sql_event)
 
   CreateIndexStmt *create_index_stmt = static_cast<CreateIndexStmt *>(stmt);
 
-  Trx   *trx   = session->current_trx();
+  Trx   *trx   = session->current_trx();  // 从session对象中获取当前事务
   Table *table = create_index_stmt->table();
-  return table->create_index(trx, create_index_stmt->field_meta(), create_index_stmt->index_name().c_str());
+  return table->create_index(trx, create_index_stmt->is_unique(), create_index_stmt->field_metas(), create_index_stmt->index_name().c_str());  //根据Multi-index进行改造， create_index stmt由此进行调用，作为重要的参数传递进去
 }