Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.gitignore
#	.gitmodules
#	CMakeLists.txt
#	build.sh
#	docs/docs/game/miniob-vectordb.md
#	src/common/log/log.h
#	src/common/sys/rc.h
#	src/observer/common/init.cpp
#	src/observer/common/value.cpp
#	src/observer/common/value.h
#	src/observer/net/cli_communicator.cpp
#	src/observer/net/sql_task_handler.h
#	src/observer/sql/executor/create_table_executor.cpp
#	src/observer/sql/executor/load_data_executor.cpp
#	src/observer/sql/executor/load_data_executor.h
#	src/observer/sql/executor/set_variable_executor.cpp
#	src/observer/sql/expr/aggregate_hash_table.h
#	src/observer/sql/expr/aggregator.h
#	src/observer/sql/expr/arithmetic_operator.hpp
#	src/observer/sql/expr/expression.cpp
#	src/observer/sql/expr/expression.h
#	src/observer/sql/expr/expression_iterator.h
#	src/observer/sql/expr/expression_tuple.h
#	src/observer/sql/expr/tuple.h
#	src/observer/sql/expr/tuple_cell.h
#	src/observer/sql/operator/aggregate_vec_physical_operator.cpp
#	src/observer/sql/operator/calc_physical_operator.h
#	src/observer/sql/operator/delete_logical_operator.h
#	src/observer/sql/operator/delete_physical_operator.h
#	src/observer/sql/operator/explain_physical_operator.cpp
#	src/observer/sql/operator/group_by_vec_physical_operator.h
#	src/observer/sql/operator/insert_logical_operator.cpp
#	src/observer/sql/operator/insert_logical_operator.h
#	src/observer/sql/operator/insert_physical_operator.h
#	src/observer/sql/operator/logical_operator.cpp
#	src/observer/sql/operator/physical_operator.cpp
#	src/observer/sql/operator/physical_operator.h
#	src/observer/sql/operator/string_list_physical_operator.h
#	src/observer/sql/operator/table_get_logical_operator.cpp
#	src/observer/sql/operator/table_get_logical_operator.h
#	src/observer/sql/optimizer/conjunction_simplification_rule.cpp
#	src/observer/sql/optimizer/logical_plan_generator.cpp
#	src/observer/sql/optimizer/logical_plan_generator.h
#	src/observer/sql/optimizer/optimize_stage.cpp
#	src/observer/sql/optimizer/physical_plan_generator.cpp
#	src/observer/sql/optimizer/physical_plan_generator.h
#	src/observer/sql/optimizer/predicate_pushdown_rewriter.cpp
#	src/observer/sql/parser/expression_binder.cpp
#	src/observer/sql/parser/expression_binder.h
#	src/observer/sql/parser/gen_parser.sh
#	src/observer/sql/parser/lex_sql.cpp
#	src/observer/sql/parser/lex_sql.h
#	src/observer/sql/parser/lex_sql.l
#	src/observer/sql/parser/parse_defs.h
#	src/observer/sql/parser/yacc_sql.cpp
#	src/observer/sql/parser/yacc_sql.hpp
#	src/observer/sql/parser/yacc_sql.y
#	src/observer/sql/stmt/create_index_stmt.h
#	src/observer/sql/stmt/create_table_stmt.cpp
#	src/observer/sql/stmt/create_table_stmt.h
#	src/observer/sql/stmt/delete_stmt.cpp
#	src/observer/sql/stmt/filter_stmt.cpp
#	src/observer/sql/stmt/filter_stmt.h
#	src/observer/sql/stmt/load_data_stmt.h
#	src/observer/sql/stmt/select_stmt.h
#	src/observer/sql/stmt/stmt.cpp
#	src/observer/sql/stmt/stmt.h
#	src/observer/storage/buffer/frame.cpp
#	src/observer/storage/buffer/page.h
#	src/observer/storage/clog/log_file.cpp
#	src/observer/storage/common/meta_util.h
#	src/observer/storage/db/db.cpp
#	src/observer/storage/db/db.h
#	src/observer/storage/field/field_meta.cpp
#	src/observer/storage/index/bplus_tree.cpp
#	src/observer/storage/record/record.h
#	src/observer/storage/record/record_manager.cpp
#	src/observer/storage/record/record_manager.h
#	src/observer/storage/table/table.cpp
#	src/observer/storage/table/table.h
#	src/observer/storage/table/table_meta.cpp
#	src/observer/storage/table/table_meta.h
#	src/observer/storage/trx/mvcc_trx.cpp
#	src/observer/storage/trx/mvcc_trx.h
#	src/observer/storage/trx/trx.h
#	src/observer/storage/trx/vacuous_trx.h
#	test/case/miniob_test.py
#	test/case/result/primary-aggregation-func.result
#	test/case/result/primary-complex-sub-query.result
#	test/case/result/primary-drop-table.result
#	test/case/result/primary-group-by.result
#	test/case/result/primary-insert.result
#	test/case/result/primary-null.result
#	test/case/result/primary-simple-sub-query.result
#	test/case/result/primary-text.result
#	test/case/result/primary-unique.result
#	test/case/result/primary-update.result
#	test/case/test/primary-insert.test
#	test/case/test/primary-null.test
#	test/perf/client_performance_test.cpp
#	unittest/observer/mvcc_trx_log_test.cpp

Author: HuXin0817

.vscode/launch.json

@@ -1,3 +1,70 @@
+# 开源声明
+
+## 版权与授权
+1. **双源许可声明**  
+   本仓库包含两部分代码：
+   - OceanBase 团队开发的 MiniOB 基础框架（遵循 [木兰宽松许可证第2版](https://license.coscl.org.cn/MulanPSL2)）
+   - RushDB 团队竞赛开发代码（© 2024 RushDB 实验室，额外适用以下竞赛特别条款）
+
+2. **竞赛使用限制**  
+   依据 OceanBase 大赛官方规则：
+   > "参赛作品必须为团队原创，参考开源代码需显著声明并保持技术可追溯性"
+   - 禁止直接提交本仓库代码或关键模块（如存储引擎/优化器实现）作为参赛作品
+   - 允许参考架构设计文档（需注明出处）
+   - 允许复用基础工具类代码（需修改代码指纹）
+
+## 防抄袭措施
+1. **技术标识**  
+   - 关键算法植入版本水印
+   - 数据库元数据包含构建机器指纹
+   - 性能测试模块内嵌隐蔽校验逻辑
+
+2. **追责机制**  
+   大赛技术委员会已备案本仓库：
+   - 代码相似度检测阈值 ≥30% 将触发人工复核
+   - 可通过 `strings` 命令提取的开发者签名验证代码来源
+
+## 免责声明
+1. **责任边界**  
+   本仓库维护者不承担：
+   - 因违规参赛导致的学术处分
+   - 基于旧版本代码的兼容性问题
+   - 企业级环境下的数据安全风险
+
+2. **赞助商声明**  
+   [RushDB 实验室](https://github.com/RushDB-Lab) 仅提供品牌支持：
+   - 未参与具体代码开发
+   - 不担保系统稳定性
+   - 商业场景使用需另行授权
+
+## 合理使用指引
+✅ 允许行为：
+- Fork 仓库进行学习研究
+- 引用设计文档（需显式标注）
+- 二次开发非竞赛用途系统
+
+❌ 禁止行为：
+- 删除代码版权注释
+- 伪装原创提交竞赛
+- 商业用途未授权分发
+
+---
+
+# 作品简介
+队伍学校：**成都理工大学 & 沈阳工业大学**
+
+队伍名称：**RushDB**
+
+队伍成员：**明泰**、**胡鑫**、**吴奕民**
+
+金牌🥇赞助：[**RushDB 实验室**](https://github.com/RushDB-Lab)
+
+初赛完成度（**100%**）
+
+![初赛](https://pic1.imgdb.cn/item/67c1b360d0e0a243d4083540.png)
+
+[![Visitors](https://api.visitorbadge.io/api/visitors?path=https://github.com/RushDB-Lab/miniob&label=visitors&countColor=%23263759)](https://visitorbadge.io/status?path=https://github.com/RushDB-Lab/miniob)
+
 # MiniOB 介绍
 
 <div align="left">

.vscode/tasks.json

@@ -0,0 +1 @@
+Subproject commit 6f7d74063db39b5bab5a6f9378f83536a5009e98

README.md

@@ -40,4 +40,4 @@ class DeferHelper
 
 #define SCOPE_UNIQUE_NAME(B) _SCOPE_UNIQUE_NAME(B, __LINE__)
 
-#define DEFER(...) common::DeferHelper SCOPE_UNIQUE_NAME(defer_helper_)([&]() { __VA_ARGS__; })
+#define DEFER(...) common::DeferHelper SCOPE_UNIQUE_NAME(defer_helper_)([&]() { __VA_ARGS__; })

deps/3rd/benchmark

@@ -58,8 +58,8 @@ typedef enum
 class Log
 {
 public:
-  Log(const string &log_name, const LOG_LEVEL log_level = LOG_LEVEL_INFO,
-      const LOG_LEVEL console_level = LOG_LEVEL_WARN);
+   Log(const string &log_name, const LOG_LEVEL log_level = LOG_LEVEL_INFO,
+       const LOG_LEVEL console_level = LOG_LEVEL_WARN);
   ~Log(void);
 
   static int init(const string &log_file);
@@ -162,7 +162,7 @@ class Log
 class LoggerFactory
 {
 public:
-  LoggerFactory();
+           LoggerFactory();
   virtual ~LoggerFactory();
 
   static int init(const string &log_file, Log **logger, LOG_LEVEL log_level = LOG_LEVEL_INFO,
@@ -228,7 +228,12 @@ extern Log *g_log;
 #define LOG_DEFAULT(fmt, ...) LOG_OUTPUT(common::g_log->get_log_level(), fmt, ##__VA_ARGS__)
 #define LOG_PANIC(fmt, ...) LOG_OUTPUT(common::LOG_LEVEL_PANIC, fmt, ##__VA_ARGS__)
 #define LOG_ERROR(fmt, ...) LOG_OUTPUT(common::LOG_LEVEL_ERR, fmt, ##__VA_ARGS__)
-#define LOG_WARN(fmt, ...) LOG_OUTPUT(common::LOG_LEVEL_WARN, fmt, ##__VA_ARGS__)
+#define LOG_WARN(fmt, ...)                                                  \
+  do {                                                                      \
+    assert((fmt != nullptr) && "LOG_WARN: format string must not be null"); \
+    LOG_OUTPUT(common::LOG_LEVEL_WARN, fmt, ##__VA_ARGS__);                 \
+  } while (0)
+
 #define LOG_INFO(fmt, ...) LOG_OUTPUT(common::LOG_LEVEL_INFO, fmt, ##__VA_ARGS__)
 #define LOG_DEBUG(fmt, ...) LOG_OUTPUT(common::LOG_LEVEL_DEBUG, fmt, ##__VA_ARGS__)
 #define LOG_TRACE(fmt, ...) LOG_OUTPUT(common::LOG_LEVEL_TRACE, fmt, ##__VA_ARGS__)
@@ -315,13 +320,12 @@ int Log::out(const LOG_LEVEL console_level, const LOG_LEVEL log_level, T &msg)
 
 #ifndef ASSERT
 #ifdef DEBUG
-#define ASSERT(expression, description, ...) \
-  do {                                       \
-    if (!(expression)) {                     \
-      LOG_PANIC(description, ##__VA_ARGS__); \
-      LOG_PANIC("%s", lbt());                \
-      assert(expression);                    \
-    }                                        \
+#define ASSERT(expression, description, ...)  \
+  do {                                        \
+    if (!(expression)) {                      \
+      LOG_PANIC(description, ## __VA_ARGS__); \
+      assert(expression);                     \
+    }                                         \
   } while (0)
 
 #else  // DEBUG
@@ -335,7 +339,7 @@ int Log::out(const LOG_LEVEL console_level, const LOG_LEVEL log_level, T &msg)
 
 #ifndef TRACE
 #ifdef DEBUG
-#define TRACE(format, ...) LOG_TRACE(format, ##__VA_ARGS__)
+#define TRACE(format, ...) LOG_TRACE(format, ## __VA_ARGS__)
 #else  // DEBUG
 #define TRACE(...)
 #endif  // DEBUG