From 57c428179cb13cd5a70329955ff050d8f5ff8926 Mon Sep 17 00:00:00 2001 From: aradhanahegde Date: Fri, 3 Oct 2025 17:04:53 -0400 Subject: [PATCH 1/7] Added namespace oceanbase to src/observer --- src/observer/catalog/catalog.cpp | 5 +++-- src/observer/catalog/catalog.h | 5 +++-- src/observer/catalog/table_stats.h | 5 +++-- src/observer/common/global_context.cpp | 3 ++- src/observer/common/global_context.h | 5 +++-- src/observer/common/ini_setting.h | 3 ++- src/observer/common/init.cpp | 3 ++- src/observer/common/init.h | 3 ++- src/observer/common/type/attr_type.cpp | 3 ++- src/observer/common/type/attr_type.h | 3 ++- src/observer/common/type/char_type.cpp | 2 ++ src/observer/common/type/char_type.h | 3 ++- src/observer/common/type/data_type.cpp | 5 +++-- src/observer/common/type/data_type.h | 3 ++- src/observer/common/type/float_type.cpp | 2 ++ src/observer/common/type/float_type.h | 5 +++-- src/observer/common/type/integer_type.cpp | 2 ++ src/observer/common/type/integer_type.h | 5 +++-- src/observer/common/type/string_t.h | 4 +++- src/observer/common/type/vector_type.h | 5 +++-- src/observer/common/types.h | 3 ++- src/observer/common/value.cpp | 3 ++- src/observer/common/value.h | 2 ++ src/observer/event/session_event.cpp | 3 ++- src/observer/event/session_event.h | 3 ++- src/observer/event/sql_debug.cpp | 3 ++- src/observer/event/sql_debug.h | 3 ++- src/observer/event/sql_event.cpp | 3 ++- src/observer/event/sql_event.h | 3 ++- src/observer/event/storage_event.h | 3 ++- src/observer/main.cpp | 4 +++- src/observer/net/buffered_writer.cpp | 3 ++- src/observer/net/buffered_writer.h | 5 +++-- src/observer/net/cli_communicator.cpp | 3 ++- src/observer/net/cli_communicator.h | 3 ++- src/observer/net/communicator.cpp | 3 ++- src/observer/net/communicator.h | 3 ++- src/observer/net/java_thread_pool_thread_handler.cpp | 3 ++- src/observer/net/java_thread_pool_thread_handler.h | 5 +++-- src/observer/net/mysql_communicator.cpp | 3 ++- src/observer/net/mysql_communicator.h | 3 ++- .../net/one_thread_per_connection_thread_handler.cpp | 3 ++- src/observer/net/one_thread_per_connection_thread_handler.h | 5 +++-- src/observer/net/plain_communicator.cpp | 3 ++- src/observer/net/plain_communicator.h | 3 ++- src/observer/net/ring_buffer.cpp | 3 ++- src/observer/net/ring_buffer.h | 3 ++- src/observer/net/server.cpp | 3 ++- src/observer/net/server.h | 5 +++-- src/observer/net/server_param.h | 3 ++- src/observer/net/sql_task_handler.cpp | 3 ++- src/observer/net/sql_task_handler.h | 3 ++- src/observer/net/thread_handler.cpp | 3 ++- src/observer/net/thread_handler.h | 3 ++- src/observer/session/session.cpp | 3 ++- src/observer/session/session.h | 3 ++- src/observer/session/session_stage.cpp | 3 ++- src/observer/session/session_stage.h | 3 ++- src/observer/session/thread_data.cpp | 5 +++-- src/observer/session/thread_data.h | 5 +++-- src/observer/sql/executor/analyze_table_executor.cpp | 3 ++- src/observer/sql/executor/analyze_table_executor.h | 3 ++- src/observer/sql/executor/command_executor.cpp | 3 ++- src/observer/sql/executor/command_executor.h | 3 ++- src/observer/sql/executor/create_index_executor.cpp | 3 ++- src/observer/sql/executor/create_index_executor.h | 3 ++- src/observer/sql/executor/create_table_executor.cpp | 3 ++- src/observer/sql/executor/create_table_executor.h | 3 ++- src/observer/sql/executor/desc_table_executor.cpp | 3 ++- src/observer/sql/executor/desc_table_executor.h | 3 ++- src/observer/sql/executor/execute_stage.cpp | 3 ++- src/observer/sql/executor/execute_stage.h | 3 ++- src/observer/sql/executor/help_executor.h | 3 ++- src/observer/sql/executor/load_data_executor.cpp | 3 ++- src/observer/sql/executor/load_data_executor.h | 3 ++- src/observer/sql/executor/set_variable_executor.cpp | 3 ++- src/observer/sql/executor/set_variable_executor.h | 3 ++- src/observer/sql/executor/show_tables_executor.h | 3 ++- src/observer/sql/executor/sql_result.cpp | 3 ++- src/observer/sql/executor/sql_result.h | 3 ++- src/observer/sql/executor/trx_begin_executor.h | 3 ++- src/observer/sql/executor/trx_end_executor.h | 3 ++- src/observer/sql/expr/aggregate_hash_table.cpp | 3 ++- src/observer/sql/expr/aggregate_hash_table.h | 3 ++- src/observer/sql/expr/aggregate_state.cpp | 2 ++ src/observer/sql/expr/aggregate_state.h | 4 +++- src/observer/sql/expr/aggregator.cpp | 3 ++- src/observer/sql/expr/aggregator.h | 3 ++- src/observer/sql/expr/arithmetic_operator.hpp | 3 ++- src/observer/sql/expr/composite_tuple.cpp | 3 ++- src/observer/sql/expr/composite_tuple.h | 3 ++- src/observer/sql/expr/expression.cpp | 3 ++- src/observer/sql/expr/expression.h | 3 ++- src/observer/sql/expr/expression_iterator.cpp | 3 ++- src/observer/sql/expr/expression_iterator.h | 3 ++- src/observer/sql/expr/expression_tuple.h | 3 ++- src/observer/sql/expr/tuple.h | 3 ++- src/observer/sql/expr/tuple_cell.cpp | 3 ++- src/observer/sql/expr/tuple_cell.h | 3 ++- .../sql/operator/aggregate_vec_physical_operator.cpp | 3 ++- src/observer/sql/operator/aggregate_vec_physical_operator.h | 3 ++- src/observer/sql/operator/calc_logical_operator.h | 3 ++- src/observer/sql/operator/calc_physical_operator.h | 3 ++- src/observer/sql/operator/delete_logical_operator.cpp | 3 ++- src/observer/sql/operator/delete_logical_operator.h | 3 ++- src/observer/sql/operator/delete_physical_operator.cpp | 3 ++- src/observer/sql/operator/delete_physical_operator.h | 3 ++- src/observer/sql/operator/explain_logical_operator.h | 3 ++- src/observer/sql/operator/explain_physical_operator.cpp | 4 ++-- src/observer/sql/operator/explain_physical_operator.h | 3 ++- src/observer/sql/operator/expr_vec_physical_operator.cpp | 3 ++- src/observer/sql/operator/expr_vec_physical_operator.h | 3 ++- src/observer/sql/operator/group_by_logical_operator.cpp | 3 ++- src/observer/sql/operator/group_by_logical_operator.h | 3 ++- src/observer/sql/operator/group_by_physical_operator.cpp | 3 ++- src/observer/sql/operator/group_by_physical_operator.h | 3 ++- src/observer/sql/operator/group_by_vec_physical_operator.h | 3 ++- .../sql/operator/hash_group_by_physical_operator.cpp | 3 ++- src/observer/sql/operator/hash_group_by_physical_operator.h | 3 ++- src/observer/sql/operator/hash_join_physical_operator.h | 5 +++-- src/observer/sql/operator/index_scan_physical_operator.cpp | 3 ++- src/observer/sql/operator/index_scan_physical_operator.h | 3 ++- src/observer/sql/operator/insert_logical_operator.cpp | 3 ++- src/observer/sql/operator/insert_logical_operator.h | 3 ++- src/observer/sql/operator/insert_physical_operator.cpp | 3 ++- src/observer/sql/operator/insert_physical_operator.h | 3 ++- src/observer/sql/operator/join_logical_operator.h | 3 ++- src/observer/sql/operator/join_physical_operator.cpp | 3 ++- src/observer/sql/operator/join_physical_operator.h | 3 ++- src/observer/sql/operator/logical_operator.cpp | 4 ++-- src/observer/sql/operator/logical_operator.h | 3 ++- .../sql/operator/nested_loop_join_physical_operator.cpp | 3 ++- .../sql/operator/nested_loop_join_physical_operator.h | 3 ++- src/observer/sql/operator/operator_node.h | 4 +++- src/observer/sql/operator/physical_operator.cpp | 3 ++- src/observer/sql/operator/physical_operator.h | 3 ++- src/observer/sql/operator/predicate_logical_operator.cpp | 3 ++- src/observer/sql/operator/predicate_logical_operator.h | 3 ++- src/observer/sql/operator/predicate_physical_operator.cpp | 3 ++- src/observer/sql/operator/predicate_physical_operator.h | 3 ++- src/observer/sql/operator/project_logical_operator.cpp | 3 ++- src/observer/sql/operator/project_logical_operator.h | 3 ++- src/observer/sql/operator/project_physical_operator.cpp | 3 ++- src/observer/sql/operator/project_physical_operator.h | 3 ++- src/observer/sql/operator/project_vec_physical_operator.cpp | 3 ++- src/observer/sql/operator/project_vec_physical_operator.h | 3 ++- .../sql/operator/scalar_group_by_physical_operator.cpp | 3 ++- .../sql/operator/scalar_group_by_physical_operator.h | 3 ++- src/observer/sql/operator/string_list_physical_operator.h | 3 ++- src/observer/sql/operator/table_get_logical_operator.cpp | 3 ++- src/observer/sql/operator/table_get_logical_operator.h | 3 ++- src/observer/sql/operator/table_scan_physical_operator.cpp | 3 ++- src/observer/sql/operator/table_scan_physical_operator.h | 3 ++- .../sql/operator/table_scan_vec_physical_operator.cpp | 3 ++- src/observer/sql/operator/table_scan_vec_physical_operator.h | 3 ++- src/observer/sql/optimizer/cascade/cost_model.cpp | 3 ++- src/observer/sql/optimizer/cascade/cost_model.h | 5 +++-- src/observer/sql/optimizer/cascade/group.cpp | 3 ++- src/observer/sql/optimizer/cascade/group.h | 5 +++-- src/observer/sql/optimizer/cascade/group_expr.cpp | 3 ++- src/observer/sql/optimizer/cascade/group_expr.h | 5 +++-- src/observer/sql/optimizer/cascade/implementation_rules.cpp | 5 +++-- src/observer/sql/optimizer/cascade/implementation_rules.h | 5 +++-- src/observer/sql/optimizer/cascade/memo.cpp | 3 ++- src/observer/sql/optimizer/cascade/memo.h | 5 +++-- src/observer/sql/optimizer/cascade/optimizer.cpp | 3 ++- src/observer/sql/optimizer/cascade/optimizer.h | 5 +++-- src/observer/sql/optimizer/cascade/optimizer_context.cpp | 5 +++-- src/observer/sql/optimizer/cascade/optimizer_context.h | 5 +++-- src/observer/sql/optimizer/cascade/pattern.h | 5 +++-- src/observer/sql/optimizer/cascade/pending_tasks.h | 5 +++-- src/observer/sql/optimizer/cascade/property.h | 5 +++-- src/observer/sql/optimizer/cascade/property_set.h | 5 +++-- src/observer/sql/optimizer/cascade/rules.cpp | 3 ++- src/observer/sql/optimizer/cascade/rules.h | 5 +++-- src/observer/sql/optimizer/cascade/tasks/apply_rule_task.cpp | 3 ++- src/observer/sql/optimizer/cascade/tasks/apply_rule_task.h | 5 +++-- src/observer/sql/optimizer/cascade/tasks/cascade_task.cpp | 5 +++-- src/observer/sql/optimizer/cascade/tasks/cascade_task.h | 5 +++-- src/observer/sql/optimizer/cascade/tasks/e_group_task.cpp | 3 ++- src/observer/sql/optimizer/cascade/tasks/e_group_task.h | 5 +++-- src/observer/sql/optimizer/cascade/tasks/o_expr_task.cpp | 3 ++- src/observer/sql/optimizer/cascade/tasks/o_expr_task.h | 5 +++-- src/observer/sql/optimizer/cascade/tasks/o_group_task.cpp | 3 ++- src/observer/sql/optimizer/cascade/tasks/o_group_task.h | 5 +++-- src/observer/sql/optimizer/cascade/tasks/o_input_task.cpp | 3 ++- src/observer/sql/optimizer/cascade/tasks/o_input_task.h | 5 +++-- .../sql/optimizer/comparison_simplification_rule.cpp | 3 ++- src/observer/sql/optimizer/comparison_simplification_rule.h | 3 ++- .../sql/optimizer/conjunction_simplification_rule.cpp | 3 ++- src/observer/sql/optimizer/conjunction_simplification_rule.h | 3 ++- src/observer/sql/optimizer/expression_rewriter.cpp | 3 ++- src/observer/sql/optimizer/expression_rewriter.h | 3 ++- src/observer/sql/optimizer/logical_plan_generator.cpp | 3 ++- src/observer/sql/optimizer/logical_plan_generator.h | 3 ++- src/observer/sql/optimizer/optimize_stage.cpp | 3 ++- src/observer/sql/optimizer/optimize_stage.h | 3 ++- src/observer/sql/optimizer/optimizer_utils.cpp | 3 ++- src/observer/sql/optimizer/optimizer_utils.h | 5 +++-- src/observer/sql/optimizer/physical_plan_generator.cpp | 3 ++- src/observer/sql/optimizer/physical_plan_generator.h | 3 ++- src/observer/sql/optimizer/predicate_pushdown_rewriter.cpp | 3 ++- src/observer/sql/optimizer/predicate_pushdown_rewriter.h | 3 ++- src/observer/sql/optimizer/predicate_rewrite.cpp | 3 ++- src/observer/sql/optimizer/predicate_rewrite.h | 3 ++- src/observer/sql/optimizer/predicate_to_join_rule.h | 3 ++- src/observer/sql/optimizer/rewrite_rule.h | 3 ++- src/observer/sql/optimizer/rewriter.cpp | 3 ++- src/observer/sql/optimizer/rewriter.h | 3 ++- src/observer/sql/optimizer/statistics/table_statistics.h | 5 +++-- src/observer/sql/parser/expression_binder.cpp | 3 ++- src/observer/sql/parser/expression_binder.h | 3 ++- src/observer/sql/parser/parse.cpp | 3 ++- src/observer/sql/parser/parse.h | 3 ++- src/observer/sql/parser/parse_defs.h | 3 ++- src/observer/sql/parser/parse_stage.cpp | 3 ++- src/observer/sql/parser/parse_stage.h | 3 ++- src/observer/sql/parser/resolve_stage.cpp | 3 ++- src/observer/sql/parser/resolve_stage.h | 3 ++- src/observer/sql/plan_cache/plan_cache_stage.h | 3 ++- src/observer/sql/query_cache/query_cache_stage.cpp | 3 ++- src/observer/sql/query_cache/query_cache_stage.h | 3 ++- src/observer/sql/stmt/analyze_table_stmt.cpp | 3 ++- src/observer/sql/stmt/analyze_table_stmt.h | 3 ++- src/observer/sql/stmt/calc_stmt.h | 3 ++- src/observer/sql/stmt/create_index_stmt.cpp | 3 ++- src/observer/sql/stmt/create_index_stmt.h | 3 ++- src/observer/sql/stmt/create_table_stmt.cpp | 3 ++- src/observer/sql/stmt/create_table_stmt.h | 3 ++- src/observer/sql/stmt/delete_stmt.cpp | 3 ++- src/observer/sql/stmt/delete_stmt.h | 3 ++- src/observer/sql/stmt/desc_table_stmt.cpp | 3 ++- src/observer/sql/stmt/desc_table_stmt.h | 3 ++- src/observer/sql/stmt/exit_stmt.h | 5 +++-- src/observer/sql/stmt/explain_stmt.cpp | 3 ++- src/observer/sql/stmt/explain_stmt.h | 3 ++- src/observer/sql/stmt/filter_stmt.cpp | 3 ++- src/observer/sql/stmt/filter_stmt.h | 3 ++- src/observer/sql/stmt/help_stmt.h | 5 +++-- src/observer/sql/stmt/insert_stmt.cpp | 3 ++- src/observer/sql/stmt/insert_stmt.h | 3 ++- src/observer/sql/stmt/load_data_stmt.cpp | 3 ++- src/observer/sql/stmt/load_data_stmt.h | 3 ++- src/observer/sql/stmt/select_stmt.cpp | 3 ++- src/observer/sql/stmt/select_stmt.h | 3 ++- src/observer/sql/stmt/set_variable_stmt.h | 5 +++-- src/observer/sql/stmt/show_tables_stmt.h | 5 +++-- src/observer/sql/stmt/stmt.cpp | 3 ++- src/observer/sql/stmt/stmt.h | 3 ++- src/observer/sql/stmt/trx_begin_stmt.h | 5 +++-- src/observer/sql/stmt/trx_end_stmt.h | 5 +++-- src/observer/sql/stmt/update_stmt.cpp | 3 ++- src/observer/sql/stmt/update_stmt.h | 3 ++- src/observer/storage/buffer/buffer_pool_log.cpp | 3 ++- src/observer/storage/buffer/buffer_pool_log.h | 3 ++- src/observer/storage/buffer/disk_buffer_pool.cpp | 3 ++- src/observer/storage/buffer/disk_buffer_pool.h | 3 ++- src/observer/storage/buffer/double_write_buffer.cpp | 3 ++- src/observer/storage/buffer/double_write_buffer.h | 3 ++- src/observer/storage/buffer/frame.cpp | 3 ++- src/observer/storage/buffer/frame.h | 3 ++- src/observer/storage/buffer/page.h | 3 ++- src/observer/storage/clog/disk_log_handler.cpp | 3 ++- src/observer/storage/clog/disk_log_handler.h | 3 ++- src/observer/storage/clog/integrated_log_replayer.cpp | 3 ++- src/observer/storage/clog/integrated_log_replayer.h | 5 +++-- src/observer/storage/clog/log_buffer.cpp | 3 ++- src/observer/storage/clog/log_buffer.h | 3 ++- src/observer/storage/clog/log_entry.cpp | 3 ++- src/observer/storage/clog/log_entry.h | 3 ++- src/observer/storage/clog/log_file.cpp | 3 ++- src/observer/storage/clog/log_file.h | 3 ++- src/observer/storage/clog/log_handler.cpp | 3 ++- src/observer/storage/clog/log_handler.h | 3 ++- src/observer/storage/clog/log_module.h | 5 +++-- src/observer/storage/clog/log_replayer.h | 3 ++- src/observer/storage/clog/vacuous_log_handler.h | 5 +++-- src/observer/storage/common/arena_allocator.cpp | 3 ++- src/observer/storage/common/arena_allocator.h | 3 ++- src/observer/storage/common/chunk.cpp | 3 ++- src/observer/storage/common/chunk.h | 3 ++- src/observer/storage/common/codec.cpp | 2 +- src/observer/storage/common/codec.h | 3 ++- src/observer/storage/common/column.cpp | 3 ++- src/observer/storage/common/column.h | 3 ++- src/observer/storage/common/condition_filter.cpp | 3 ++- src/observer/storage/common/condition_filter.h | 3 ++- src/observer/storage/common/meta_util.cpp | 3 ++- src/observer/storage/common/meta_util.h | 3 ++- src/observer/storage/common/vector_buffer.h | 5 +++-- src/observer/storage/db/db.cpp | 3 ++- src/observer/storage/db/db.h | 3 ++- src/observer/storage/default/default_handler.cpp | 3 ++- src/observer/storage/default/default_handler.h | 3 ++- src/observer/storage/field/field.cpp | 5 +++-- src/observer/storage/field/field.h | 3 ++- src/observer/storage/field/field_meta.cpp | 3 ++- src/observer/storage/field/field_meta.h | 3 ++- src/observer/storage/index/bplus_tree.cpp | 3 ++- src/observer/storage/index/bplus_tree.h | 3 ++- src/observer/storage/index/bplus_tree_index.cpp | 3 ++- src/observer/storage/index/bplus_tree_index.h | 3 ++- src/observer/storage/index/bplus_tree_log.cpp | 3 ++- src/observer/storage/index/bplus_tree_log.h | 3 ++- src/observer/storage/index/bplus_tree_log_entry.cpp | 3 ++- src/observer/storage/index/bplus_tree_log_entry.h | 3 ++- src/observer/storage/index/index.cpp | 3 ++- src/observer/storage/index/index.h | 3 ++- src/observer/storage/index/index_meta.cpp | 5 +++-- src/observer/storage/index/index_meta.h | 3 ++- src/observer/storage/index/ivfflat_index.h | 3 ++- src/observer/storage/index/latch_memo.cpp | 3 ++- src/observer/storage/index/latch_memo.h | 3 ++- src/observer/storage/persist/persist.cpp | 3 ++- src/observer/storage/persist/persist.h | 3 ++- src/observer/storage/record/heap_record_scanner.cpp | 3 ++- src/observer/storage/record/heap_record_scanner.h | 5 +++-- src/observer/storage/record/lob_handler.cpp | 3 ++- src/observer/storage/record/lob_handler.h | 5 +++-- src/observer/storage/record/lsm_record_scanner.cpp | 3 ++- src/observer/storage/record/lsm_record_scanner.h | 4 +++- src/observer/storage/record/record.h | 3 ++- src/observer/storage/record/record_log.cpp | 3 ++- src/observer/storage/record/record_log.h | 3 ++- src/observer/storage/record/record_manager.cpp | 3 ++- src/observer/storage/record/record_manager.h | 3 ++- src/observer/storage/record/record_scanner.h | 5 +++-- src/observer/storage/table/heap_table_engine.cpp | 3 ++- src/observer/storage/table/heap_table_engine.h | 3 ++- src/observer/storage/table/lsm_table_engine.cpp | 3 ++- src/observer/storage/table/lsm_table_engine.h | 3 ++- src/observer/storage/table/table.cpp | 3 ++- src/observer/storage/table/table.h | 3 ++- src/observer/storage/table/table_engine.h | 3 ++- src/observer/storage/table/table_meta.cpp | 3 ++- src/observer/storage/table/table_meta.h | 3 ++- src/observer/storage/trx/lsm_mvcc_trx.cpp | 3 ++- src/observer/storage/trx/lsm_mvcc_trx.h | 4 +++- src/observer/storage/trx/mvcc_trx.cpp | 3 ++- src/observer/storage/trx/mvcc_trx.h | 3 ++- src/observer/storage/trx/mvcc_trx_log.cpp | 3 ++- src/observer/storage/trx/mvcc_trx_log.h | 3 ++- src/observer/storage/trx/trx.cpp | 3 ++- src/observer/storage/trx/trx.h | 3 ++- src/observer/storage/trx/vacuous_trx.cpp | 3 ++- src/observer/storage/trx/vacuous_trx.h | 5 +++-- 346 files changed, 751 insertions(+), 397 deletions(-) diff --git a/src/observer/catalog/catalog.cpp b/src/observer/catalog/catalog.cpp index 367786a62..0d61e72cc 100644 --- a/src/observer/catalog/catalog.cpp +++ b/src/observer/catalog/catalog.cpp @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "catalog/catalog.h" - +namespace oceanbase{ const TableStats &Catalog::get_table_stats(int table_id) { lock_guard lock(mutex_); @@ -20,4 +20,5 @@ void Catalog::update_table_stats(int table_id, const TableStats &table_stats) { lock_guard lock(mutex_); table_stats_[table_id] = table_stats; -} \ No newline at end of file +} +} diff --git a/src/observer/catalog/catalog.h b/src/observer/catalog/catalog.h index 73d47d778..4b1c3ab41 100644 --- a/src/observer/catalog/catalog.h +++ b/src/observer/catalog/catalog.h @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/unordered_map.h" #include "common/lang/mutex.h" #include "catalog/table_stats.h" - +namespace oceanbase{ /** * @class Catalog * @brief Store metadata, such as table statistics. @@ -71,4 +71,5 @@ class Catalog * This map is currently not persisted and its persistence is planned via a system table. */ unordered_map table_stats_; ///< Table statistics storage. -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/catalog/table_stats.h b/src/observer/catalog/table_stats.h index 475f47ea5..5b2c74fcc 100644 --- a/src/observer/catalog/table_stats.h +++ b/src/observer/catalog/table_stats.h @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #pragma once - +namespace oceanbase{ /** * @class TableStats * @brief Represents statistics related to a table. @@ -36,4 +36,5 @@ class TableStats ~TableStats() = default; int row_nums = 0; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/common/global_context.cpp b/src/observer/common/global_context.cpp index da7120188..1ab4d43ea 100644 --- a/src/observer/common/global_context.cpp +++ b/src/observer/common/global_context.cpp @@ -13,7 +13,8 @@ See the Mulan PSL v2 for more details. */ // #include "common/global_context.h" - +namespace oceanbase{ static GlobalContext global_context; GlobalContext &GlobalContext::instance() { return global_context; } +} \ No newline at end of file diff --git a/src/observer/common/global_context.h b/src/observer/common/global_context.h index acf5c3adf..44f07e7cd 100644 --- a/src/observer/common/global_context.h +++ b/src/observer/common/global_context.h @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // #pragma once - +namespace oceanbase{ class BufferPoolManager; class DefaultHandler; class TrxKit; @@ -31,4 +31,5 @@ struct GlobalContext static GlobalContext &instance(); }; -#define GCTX GlobalContext::instance() \ No newline at end of file +#define GCTX GlobalContext::instance() +} \ No newline at end of file diff --git a/src/observer/common/ini_setting.h b/src/observer/common/ini_setting.h index 74a35de3d..5e92eea2e 100644 --- a/src/observer/common/ini_setting.h +++ b/src/observer/common/ini_setting.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once //! this document is used for ini setting - +namespace oceanbase{ #define CLIENT_ADDRESS "CLIENT_ADDRESS" #define MAX_CONNECTION_NUM "MAX_CONNECTION_NUM" #define MAX_CONNECTION_NUM_DEFAULT 8192 @@ -25,3 +25,4 @@ See the Mulan PSL v2 for more details. */ #define SOCKET_BUFFER_SIZE 8192 #define SESSION_STAGE_NAME "SessionStage" +} diff --git a/src/observer/common/init.cpp b/src/observer/common/init.cpp index a48b73499..308d36b7e 100644 --- a/src/observer/common/init.cpp +++ b/src/observer/common/init.cpp @@ -31,7 +31,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/trx/trx.h" using namespace common; - +namespace oceanbase{ bool *&_get_init() { static bool util_init = false; @@ -236,3 +236,4 @@ void cleanup_util() } void cleanup() { cleanup_util(); } +} \ No newline at end of file diff --git a/src/observer/common/init.h b/src/observer/common/init.h index 466415dbd..781808d58 100644 --- a/src/observer/common/init.h +++ b/src/observer/common/init.h @@ -16,6 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/conf/ini.h" #include "common/os/process_param.h" - +namespace oceanbase{ int init(common::ProcessParam *processParam); void cleanup(); +} \ No newline at end of file diff --git a/src/observer/common/type/attr_type.cpp b/src/observer/common/type/attr_type.cpp index e8af0084a..fe7c5b1af 100644 --- a/src/observer/common/type/attr_type.cpp +++ b/src/observer/common/type/attr_type.cpp @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "common/type/attr_type.h" - +namespace oceanbase{ const char *ATTR_TYPE_NAME[] = {"undefined", "chars", "ints", "floats", "vectors", "booleans"}; const char *attr_type_to_string(AttrType type) @@ -40,4 +40,5 @@ bool is_numerical_type(AttrType type) bool is_string_type(AttrType type) { return (type == AttrType::CHARS); +} } \ No newline at end of file diff --git a/src/observer/common/type/attr_type.h b/src/observer/common/type/attr_type.h index d1c07e3a2..4570b2649 100644 --- a/src/observer/common/type/attr_type.h +++ b/src/observer/common/type/attr_type.h @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #pragma once - +namespace oceanbase{ /** * @brief 属性的类型 * @details AttrType 枚举列出了属性的各种数据类型。 @@ -29,3 +29,4 @@ const char *attr_type_to_string(AttrType type); AttrType attr_type_from_string(const char *s); bool is_numerical_type(AttrType type); bool is_string_type(AttrType type); +} \ No newline at end of file diff --git a/src/observer/common/type/char_type.cpp b/src/observer/common/type/char_type.cpp index 6c93114a9..15adb60ee 100644 --- a/src/observer/common/type/char_type.cpp +++ b/src/observer/common/type/char_type.cpp @@ -13,6 +13,7 @@ See the Mulan PSL v2 for more details. */ #include "common/type/char_type.h" #include "common/value.h" +namespace oceanbase{ int CharType::compare(const Value &left, const Value &right) const { ASSERT(left.attr_type() == AttrType::CHARS && right.attr_type() == AttrType::CHARS, "invalid type"); @@ -48,4 +49,5 @@ RC CharType::to_string(const Value &val, string &result) const ss << val.value_.pointer_value_; result = ss.str(); return RC::SUCCESS; +} } \ No newline at end of file diff --git a/src/observer/common/type/char_type.h b/src/observer/common/type/char_type.h index 74dab5092..47a8b7ecf 100644 --- a/src/observer/common/type/char_type.h +++ b/src/observer/common/type/char_type.h @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "common/type/data_type.h" - +namespace oceanbase{ /** * @brief 固定长度的字符串类型 * @ingroup DataType @@ -34,3 +34,4 @@ class CharType : public DataType RC to_string(const Value &val, string &result) const override; }; +} \ No newline at end of file diff --git a/src/observer/common/type/data_type.cpp b/src/observer/common/type/data_type.cpp index 6df3fa6ac..c72a2872a 100644 --- a/src/observer/common/type/data_type.cpp +++ b/src/observer/common/type/data_type.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ #include "common/type/integer_type.h" #include "common/type/data_type.h" #include "common/type/vector_type.h" - +namespace oceanbase{ // Todo: 实现新数据类型 // your code here @@ -24,4 +24,5 @@ array, static_cast(AttrType::MAXTYPE)> DataType::type_ make_unique(), make_unique(), make_unique(AttrType::BOOLEANS), -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/common/type/data_type.h b/src/observer/common/type/data_type.h index 54f0f3dc0..21a039657 100644 --- a/src/observer/common/type/data_type.h +++ b/src/observer/common/type/data_type.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "common/sys/rc.h" #include "common/type/attr_type.h" - +namespace oceanbase{ class Value; class Column; @@ -104,3 +104,4 @@ class DataType static array, static_cast(AttrType::MAXTYPE)> type_instances_; }; +} \ No newline at end of file diff --git a/src/observer/common/type/float_type.cpp b/src/observer/common/type/float_type.cpp index 207f705a7..9bd3eb4f4 100644 --- a/src/observer/common/type/float_type.cpp +++ b/src/observer/common/type/float_type.cpp @@ -17,6 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/value.h" #include "storage/common/column.h" +namespace oceanbase{ int FloatType::compare(const Value &left, const Value &right) const { ASSERT(left.attr_type() == AttrType::FLOATS, "left type is not float"); @@ -92,3 +93,4 @@ RC FloatType::to_string(const Value &val, string &result) const result = ss.str(); return RC::SUCCESS; } +} diff --git a/src/observer/common/type/float_type.h b/src/observer/common/type/float_type.h index 9bf0be848..cb188d48a 100644 --- a/src/observer/common/type/float_type.h +++ b/src/observer/common/type/float_type.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/type/data_type.h" - +namespace oceanbase{ /** * @brief 浮点型数据类型 * @ingroup DataType @@ -34,4 +34,5 @@ class FloatType : public DataType RC set_value_from_str(Value &val, const string &data) const override; RC to_string(const Value &val, string &result) const override; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/common/type/integer_type.cpp b/src/observer/common/type/integer_type.cpp index 48f20f7df..2ecf0f576 100644 --- a/src/observer/common/type/integer_type.cpp +++ b/src/observer/common/type/integer_type.cpp @@ -15,6 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "common/value.h" #include "storage/common/column.h" +namespace oceanbase{ int IntegerType::compare(const Value &left, const Value &right) const { ASSERT(left.attr_type() == AttrType::INTS, "left type is not integer"); @@ -97,4 +98,5 @@ RC IntegerType::to_string(const Value &val, string &result) const ss << val.value_.int_value_; result = ss.str(); return RC::SUCCESS; +} } \ No newline at end of file diff --git a/src/observer/common/type/integer_type.h b/src/observer/common/type/integer_type.h index 9b6472e34..c3b5822b7 100644 --- a/src/observer/common/type/integer_type.h +++ b/src/observer/common/type/integer_type.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/type/data_type.h" - +namespace oceanbase{ /** * @brief 整型类型 * @ingroup DataType @@ -45,4 +45,5 @@ class IntegerType : public DataType RC set_value_from_str(Value &val, const string &data) const override; RC to_string(const Value &val, string &result) const override; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/common/type/string_t.h b/src/observer/common/type/string_t.h index bf5cf78e4..6fcd23cec 100644 --- a/src/observer/common/type/string_t.h +++ b/src/observer/common/type/string_t.h @@ -14,6 +14,7 @@ See the Mulan PSL v2 for more details. */ #include using namespace std; +namespace oceanbase{ struct string_t { public: @@ -101,4 +102,5 @@ struct string_t } pointer; Inlined inlined; } value; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/common/type/vector_type.h b/src/observer/common/type/vector_type.h index 9e9f81509..d863f4d69 100644 --- a/src/observer/common/type/vector_type.h +++ b/src/observer/common/type/vector_type.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/type/data_type.h" - +namespace oceanbase{ /** * @brief 向量类型 * @ingroup DataType @@ -29,4 +29,5 @@ class VectorType : public DataType RC multiply(const Value &left, const Value &right, Value &result) const override { return RC::UNIMPLEMENTED; } RC to_string(const Value &val, string &result) const override { return RC::UNIMPLEMENTED; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/common/types.h b/src/observer/common/types.h index 9c40b7976..2deb61a25 100644 --- a/src/observer/common/types.h +++ b/src/observer/common/types.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include #include - +namespace oceanbase{ /// 磁盘文件，包括存放数据的文件和索引(B+-Tree)文件，都按照页来组织 /// 每一页都有一个编号，称为PageNum using PageNum = int32_t; @@ -75,3 +75,4 @@ enum class ExecutionMode /// page的CRC校验和 using CheckSum = unsigned int; +} \ No newline at end of file diff --git a/src/observer/common/value.cpp b/src/observer/common/value.cpp index 424c67350..954aedaa7 100644 --- a/src/observer/common/value.cpp +++ b/src/observer/common/value.cpp @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/sstream.h" #include "common/lang/string.h" #include "common/log/log.h" - +namespace oceanbase{ Value::Value(int val) { set_int(val); } Value::Value(float val) { set_float(val); } @@ -349,3 +349,4 @@ bool Value::get_boolean() const } return false; } +} \ No newline at end of file diff --git a/src/observer/common/value.h b/src/observer/common/value.h index ca31eedc4..9b18a46bf 100644 --- a/src/observer/common/value.h +++ b/src/observer/common/value.h @@ -20,6 +20,7 @@ See the Mulan PSL v2 for more details. */ #include "common/type/data_type.h" #include "common/type/string_t.h" +namespace oceanbase{ /** * @brief 属性的值 * @ingroup DataType @@ -135,3 +136,4 @@ class Value final /// 是否申请并占有内存, 目前对于 CHARS 类型 own_data_ 为true, 其余类型 own_data_ 为false bool own_data_ = false; }; +} \ No newline at end of file diff --git a/src/observer/event/session_event.cpp b/src/observer/event/session_event.cpp index 41ca80d4f..c5dafaee3 100644 --- a/src/observer/event/session_event.cpp +++ b/src/observer/event/session_event.cpp @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "session_event.h" #include "net/communicator.h" - +namespace oceanbase{ SessionEvent::SessionEvent(Communicator *comm) : communicator_(comm), sql_result_(communicator_->session()) {} SessionEvent::~SessionEvent() {} @@ -22,3 +22,4 @@ SessionEvent::~SessionEvent() {} Communicator *SessionEvent::get_communicator() const { return communicator_; } Session *SessionEvent::session() const { return communicator_->session(); } +} \ No newline at end of file diff --git a/src/observer/event/session_event.h b/src/observer/event/session_event.h index 7a279ca36..b8a99db12 100644 --- a/src/observer/event/session_event.h +++ b/src/observer/event/session_event.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "event/sql_debug.h" #include "sql/executor/sql_result.h" - +namespace oceanbase{ class Session; class Communicator; @@ -46,3 +46,4 @@ class SessionEvent SqlDebug sql_debug_; ///< SQL调试信息 string query_; ///< SQL语句 }; +} \ No newline at end of file diff --git a/src/observer/event/sql_debug.cpp b/src/observer/event/sql_debug.cpp index ab68dc17e..e4a7a5331 100644 --- a/src/observer/event/sql_debug.cpp +++ b/src/observer/event/sql_debug.cpp @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "event/sql_debug.h" #include "session/session.h" - +namespace oceanbase{ void SqlDebug::add_debug_info(const string &debug_info) { debug_infos_.push_back(debug_info); } void SqlDebug::clear_debug_info() { debug_infos_.clear(); } @@ -52,3 +52,4 @@ void sql_debug(const char *fmt, ...) delete[] str; } +} \ No newline at end of file diff --git a/src/observer/event/sql_debug.h b/src/observer/event/sql_debug.h index 66d182466..13f6bf112 100644 --- a/src/observer/event/sql_debug.h +++ b/src/observer/event/sql_debug.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "common/lang/list.h" - +namespace oceanbase{ /** * @brief SQL调试信息 * @details @@ -46,3 +46,4 @@ class SqlDebug * 在普通文本场景下，调试信息会直接输出到客户端，并增加 '#' 作为前缀。 */ void sql_debug(const char *fmt, ...); +} \ No newline at end of file diff --git a/src/observer/event/sql_event.cpp b/src/observer/event/sql_event.cpp index 6df5fc255..173fd8d89 100644 --- a/src/observer/event/sql_event.cpp +++ b/src/observer/event/sql_event.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "event/session_event.h" #include "sql/stmt/stmt.h" - +namespace oceanbase{ SQLStageEvent::SQLStageEvent(SessionEvent *event, const string &sql) : session_event_(event), sql_(sql) {} SQLStageEvent::~SQLStageEvent() noexcept @@ -30,3 +30,4 @@ SQLStageEvent::~SQLStageEvent() noexcept stmt_ = nullptr; } } +} \ No newline at end of file diff --git a/src/observer/event/sql_event.h b/src/observer/event/sql_event.h index cd7db0659..9de0806f8 100644 --- a/src/observer/event/sql_event.h +++ b/src/observer/event/sql_event.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "common/lang/memory.h" #include "sql/operator/physical_operator.h" - +namespace oceanbase{ class SessionEvent; class Stmt; class ParsedSqlNode; @@ -51,3 +51,4 @@ class SQLStageEvent Stmt *stmt_ = nullptr; ///< Resolver之后生成的数据结构 unique_ptr operator_; ///< 生成的执行计划，也可能没有 }; +} \ No newline at end of file diff --git a/src/observer/event/storage_event.h b/src/observer/event/storage_event.h index 567aca7e1..a9af0ac9c 100644 --- a/src/observer/event/storage_event.h +++ b/src/observer/event/storage_event.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/seda/stage_event.h" - +namespace oceanbase{ class SQLStageEvent; class StorageEvent : public common::StageEvent @@ -30,3 +30,4 @@ class StorageEvent : public common::StageEvent private: SQLStageEvent *sql_event_; }; +} \ No newline at end of file diff --git a/src/observer/main.cpp b/src/observer/main.cpp index 09c9d0029..5e6857d46 100644 --- a/src/observer/main.cpp +++ b/src/observer/main.cpp @@ -32,9 +32,10 @@ See the Mulan PSL v2 for more details. */ using namespace common; #define NET "NET" - +namespace oceanbase{ static Server *g_server = nullptr; + void usage() { cout << "Usage " << endl; @@ -207,3 +208,4 @@ int main(int argc, char **argv) delete g_server; return 0; } +} \ No newline at end of file diff --git a/src/observer/net/buffered_writer.cpp b/src/observer/net/buffered_writer.cpp index 58d189372..f72c49d5e 100644 --- a/src/observer/net/buffered_writer.cpp +++ b/src/observer/net/buffered_writer.cpp @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ #include #include "net/buffered_writer.h" - +namespace oceanbase{ BufferedWriter::BufferedWriter(int fd) : fd_(fd), buffer_() {} BufferedWriter::BufferedWriter(int fd, int32_t size) : fd_(fd), buffer_(size) {} @@ -129,3 +129,4 @@ RC BufferedWriter::flush_internal(int32_t size) return rc; } +} \ No newline at end of file diff --git a/src/observer/net/buffered_writer.h b/src/observer/net/buffered_writer.h index 3f7d8fc43..db54680d0 100644 --- a/src/observer/net/buffered_writer.h +++ b/src/observer/net/buffered_writer.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "net/ring_buffer.h" - +namespace oceanbase{ /** * @brief 支持以缓存模式写入数据到文件/socket * @details 缓存使用ring buffer实现，当缓存满时会自动刷新缓存。 @@ -69,4 +69,5 @@ class BufferedWriter private: int fd_ = -1; RingBuffer buffer_; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/net/cli_communicator.cpp b/src/observer/net/cli_communicator.cpp index 0e949d900..55602949d 100644 --- a/src/observer/net/cli_communicator.cpp +++ b/src/observer/net/cli_communicator.cpp @@ -26,7 +26,7 @@ See the Mulan PSL v2 for more details. */ using common::MiniobLineReader; const std::string LINE_HISTORY_FILE = "./.miniob.history"; - +namespace oceanbase{ RC CliCommunicator::init(int fd, unique_ptr session, const string &addr) { RC rc = PlainCommunicator::init(fd, std::move(session), addr); @@ -85,3 +85,4 @@ RC CliCommunicator::write_result(SessionEvent *event, bool &need_disconnect) } CliCommunicator::~CliCommunicator() { LOG_INFO("Command history saved to %s", LINE_HISTORY_FILE.c_str()); } +} \ No newline at end of file diff --git a/src/observer/net/cli_communicator.h b/src/observer/net/cli_communicator.h index f255ffc6b..08fa0250c 100644 --- a/src/observer/net/cli_communicator.h +++ b/src/observer/net/cli_communicator.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "net/plain_communicator.h" - +namespace oceanbase{ /** * @brief 用于命令行模式的通讯器 * @ingroup Communicator @@ -39,3 +39,4 @@ class CliCommunicator : public PlainCommunicator int write_fd_ = -1; ///< 与使用远程通讯模式不同，如果读数据使用标准输入，那么输出应该是标准输出 }; +} \ No newline at end of file diff --git a/src/observer/net/communicator.cpp b/src/observer/net/communicator.cpp index 7f80d805e..2423b8e66 100644 --- a/src/observer/net/communicator.cpp +++ b/src/observer/net/communicator.cpp @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ #include "session/session.h" #include "common/lang/mutex.h" - +namespace oceanbase{ RC Communicator::init(int fd, unique_ptr session, const string &addr) { fd_ = fd; @@ -62,3 +62,4 @@ Communicator *CommunicatorFactory::create(CommunicateProtocol protocol) } } } +} \ No newline at end of file diff --git a/src/observer/net/communicator.h b/src/observer/net/communicator.h index 0d47300cb..d7b5a902b 100644 --- a/src/observer/net/communicator.h +++ b/src/observer/net/communicator.h @@ -22,7 +22,7 @@ struct ConnectionContext; class SessionEvent; class Session; class BufferedWriter; - +namespace oceanbase{ /** * @defgroup Communicator * @brief 负责处理与客户端的通讯 @@ -106,3 +106,4 @@ class CommunicatorFactory public: Communicator *create(CommunicateProtocol protocol); }; +} \ No newline at end of file diff --git a/src/observer/net/java_thread_pool_thread_handler.cpp b/src/observer/net/java_thread_pool_thread_handler.cpp index 476fa916e..dc9d177b9 100644 --- a/src/observer/net/java_thread_pool_thread_handler.cpp +++ b/src/observer/net/java_thread_pool_thread_handler.cpp @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "common/thread/runnable.h" #include "common/queue/simple_queue.h" - +namespace oceanbase{ using namespace common; /** @@ -245,3 +245,4 @@ RC JavaThreadPoolThreadHandler::await_stop() LOG_INFO("end to await event base stopped"); return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/net/java_thread_pool_thread_handler.h b/src/observer/net/java_thread_pool_thread_handler.h index 98f68dbb9..5397b9f76 100644 --- a/src/observer/net/java_thread_pool_thread_handler.h +++ b/src/observer/net/java_thread_pool_thread_handler.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "net/sql_task_handler.h" #include "common/thread/thread_pool_executor.h" #include "common/lang/mutex.h" - +namespace oceanbase{ struct EventCallbackAg; /** @@ -67,4 +67,5 @@ class JavaThreadPoolThreadHandler : public ThreadHandler map event_map_; /// 每个连接与它关联的数据 SqlTaskHandler sql_task_handler_; /// SQL请求处理器 -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/net/mysql_communicator.cpp b/src/observer/net/mysql_communicator.cpp index d543f3a52..353704fc0 100644 --- a/src/observer/net/mysql_communicator.cpp +++ b/src/observer/net/mysql_communicator.cpp @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "net/buffered_writer.h" #include "net/mysql_communicator.h" #include "sql/operator/string_list_physical_operator.h" - +namespace oceanbase{ /** * @brief MySQL协议相关实现 * @defgroup MySQLProtocol @@ -1053,3 +1053,4 @@ RC MysqlCommunicator::write_chunk_result(SqlResult *sql_result, vector &pa } return rc; } +} \ No newline at end of file diff --git a/src/observer/net/mysql_communicator.h b/src/observer/net/mysql_communicator.h index 2f69794c0..f1183c12c 100644 --- a/src/observer/net/mysql_communicator.h +++ b/src/observer/net/mysql_communicator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "net/communicator.h" #include "common/lang/string.h" - +namespace oceanbase{ class SqlResult; class BasePacket; @@ -105,3 +105,4 @@ class MysqlCommunicator : public Communicator //! 这个sequence id是递增的 int8_t sequence_id_ = 0; }; +} \ No newline at end of file diff --git a/src/observer/net/one_thread_per_connection_thread_handler.cpp b/src/observer/net/one_thread_per_connection_thread_handler.cpp index ae977f337..9ac79130a 100644 --- a/src/observer/net/one_thread_per_connection_thread_handler.cpp +++ b/src/observer/net/one_thread_per_connection_thread_handler.cpp @@ -24,7 +24,7 @@ See the Mulan PSL v2 for more details. */ #include "net/sql_task_handler.h" using namespace common; - +namespace oceanbase{ class Worker { public: @@ -174,3 +174,4 @@ RC OneThreadPerConnectionThreadHandler::await_stop() LOG_INFO("end to await stop one thread per connection thread handler"); return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/net/one_thread_per_connection_thread_handler.h b/src/observer/net/one_thread_per_connection_thread_handler.h index 12c9f1c4d..55e843ffd 100644 --- a/src/observer/net/one_thread_per_connection_thread_handler.h +++ b/src/observer/net/one_thread_per_connection_thread_handler.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "net/thread_handler.h" #include "common/lang/mutex.h" #include "common/lang/unordered_map.h" - +namespace oceanbase{ class Worker; /** @@ -46,4 +46,5 @@ class OneThreadPerConnectionThreadHandler : public ThreadHandler unordered_map thread_map_; // 当前编译器没有支持jthread /// 保护线程安全的锁 mutex lock_; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/net/plain_communicator.cpp b/src/observer/net/plain_communicator.cpp index e16746716..73a78feff 100644 --- a/src/observer/net/plain_communicator.cpp +++ b/src/observer/net/plain_communicator.cpp @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "net/buffered_writer.h" #include "session/session.h" #include "sql/expr/tuple.h" - +namespace oceanbase{ PlainCommunicator::PlainCommunicator() { send_message_delimiter_.assign(1, '\0'); @@ -370,4 +370,5 @@ RC PlainCommunicator::write_chunk_result(SqlResult *sql_result) rc = RC::SUCCESS; } return rc; +} } \ No newline at end of file diff --git a/src/observer/net/plain_communicator.h b/src/observer/net/plain_communicator.h index 0dfabf9a2..7e21ec25b 100644 --- a/src/observer/net/plain_communicator.h +++ b/src/observer/net/plain_communicator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "net/communicator.h" #include "common/lang/vector.h" - +namespace oceanbase{ class SqlResult; /** @@ -44,3 +44,4 @@ class PlainCommunicator : public Communicator vector send_message_delimiter_; ///< 发送消息分隔符 vector debug_message_prefix_; ///< 调试信息前缀 }; +} \ No newline at end of file diff --git a/src/observer/net/ring_buffer.cpp b/src/observer/net/ring_buffer.cpp index c3b5f74e0..89535d7fa 100644 --- a/src/observer/net/ring_buffer.cpp +++ b/src/observer/net/ring_buffer.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/algorithm.h" #include "common/log/log.h" #include "net/ring_buffer.h" - +namespace oceanbase{ const int32_t DEFAULT_BUFFER_SIZE = 16 * 1024; RingBuffer::RingBuffer() : RingBuffer(DEFAULT_BUFFER_SIZE) {} @@ -104,3 +104,4 @@ RC RingBuffer::write(const char *data, int32_t size, int32_t &write_size) return rc; } +} \ No newline at end of file diff --git a/src/observer/net/ring_buffer.h b/src/observer/net/ring_buffer.h index 39f241a09..52fe1bc95 100644 --- a/src/observer/net/ring_buffer.h +++ b/src/observer/net/ring_buffer.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "common/lang/vector.h" - +namespace oceanbase{ /** * @brief 环形缓存，当前用于通讯写入数据时的缓存 * @ingroup Communicator @@ -93,3 +93,4 @@ class RingBuffer int32_t data_size_ = 0; ///< 已经写入的数据量 int32_t write_pos_ = 0; ///< 当前写指针的位置，范围不会超出[0, capacity) }; +} \ No newline at end of file diff --git a/src/observer/net/server.cpp b/src/observer/net/server.cpp index 53724e2c1..472b74adb 100644 --- a/src/observer/net/server.cpp +++ b/src/observer/net/server.cpp @@ -41,7 +41,7 @@ See the Mulan PSL v2 for more details. */ #include "net/sql_task_handler.h" using namespace common; - +namespace oceanbase{ ServerParam::ServerParam() { listen_addr = INADDR_ANY; @@ -344,3 +344,4 @@ void CliServer::shutdown() // cleanup started_ = false; } +} \ No newline at end of file diff --git a/src/observer/net/server.h b/src/observer/net/server.h index 2e39cb0ab..de3ef7915 100644 --- a/src/observer/net/server.h +++ b/src/observer/net/server.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "net/server_param.h" - +namespace oceanbase{ class Communicator; class ThreadHandler; @@ -97,4 +97,5 @@ class CliServer : public Server private: volatile bool started_ = false; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/net/server_param.h b/src/observer/net/server_param.h index 2a498a79a..ba2c522ee 100644 --- a/src/observer/net/server_param.h +++ b/src/observer/net/server_param.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "net/communicator.h" #include "common/lang/string.h" - +namespace oceanbase{ /** * @brief 服务端启动参数 * @ingroup Communicator @@ -49,3 +49,4 @@ class ServerParam string thread_handling; ///< 线程池模型 }; +} \ No newline at end of file diff --git a/src/observer/net/sql_task_handler.cpp b/src/observer/net/sql_task_handler.cpp index 90f0609b4..e4c186e5c 100644 --- a/src/observer/net/sql_task_handler.cpp +++ b/src/observer/net/sql_task_handler.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "event/session_event.h" #include "event/sql_event.h" #include "session/session.h" - +namespace oceanbase{ RC SqlTaskHandler::handle_event(Communicator *communicator) { SessionEvent *event = nullptr; @@ -88,4 +88,5 @@ RC SqlTaskHandler::handle_sql(SQLStageEvent *sql_event) } return rc; +} } \ No newline at end of file diff --git a/src/observer/net/sql_task_handler.h b/src/observer/net/sql_task_handler.h index 8c1294ee7..e0f07cdae 100644 --- a/src/observer/net/sql_task_handler.h +++ b/src/observer/net/sql_task_handler.h @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse_stage.h" #include "sql/parser/resolve_stage.h" #include "sql/query_cache/query_cache_stage.h" - +namespace oceanbase{ class Communicator; class SQLStageEvent; @@ -53,3 +53,4 @@ class SqlTaskHandler OptimizeStage optimize_stage_; /// 优化阶段。将语句优化成执行计划，包含规则优化和物理优化 ExecuteStage execute_stage_; /// 执行阶段 }; +} \ No newline at end of file diff --git a/src/observer/net/thread_handler.cpp b/src/observer/net/thread_handler.cpp index 941fcdfd9..83f75b130 100644 --- a/src/observer/net/thread_handler.cpp +++ b/src/observer/net/thread_handler.cpp @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "net/java_thread_pool_thread_handler.h" #include "common/log/log.h" #include "common/lang/string.h" - +namespace oceanbase{ ThreadHandler * ThreadHandler::create(const char *name) { const char *default_name = "one-thread-per-connection"; @@ -35,4 +35,5 @@ ThreadHandler * ThreadHandler::create(const char *name) LOG_ERROR("unknown thread handler: %s", name); return nullptr; } +} } \ No newline at end of file diff --git a/src/observer/net/thread_handler.h b/src/observer/net/thread_handler.h index fd876e63d..7f5af336b 100644 --- a/src/observer/net/thread_handler.h +++ b/src/observer/net/thread_handler.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" - +namespace oceanbase{ class Communicator; /** @@ -63,3 +63,4 @@ class ThreadHandler */ static ThreadHandler *create(const char *name); }; +} \ No newline at end of file diff --git a/src/observer/session/session.cpp b/src/observer/session/session.cpp index a5d3297e6..aeff643a4 100644 --- a/src/observer/session/session.cpp +++ b/src/observer/session/session.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/db/db.h" #include "storage/default/default_handler.h" #include "storage/trx/trx.h" - +namespace oceanbase{ Session &Session::default_session() { static Session session; @@ -93,3 +93,4 @@ Session *Session::current_session() { return thread_session; } void Session::set_current_request(SessionEvent *request) { current_request_ = request; } SessionEvent *Session::current_request() const { return current_request_; } +} \ No newline at end of file diff --git a/src/observer/session/session.h b/src/observer/session/session.h index e9139eda3..8a4d1ee83 100644 --- a/src/observer/session/session.h +++ b/src/observer/session/session.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/types.h" #include "common/lang/string.h" - +namespace oceanbase{ class Trx; class Db; class SessionEvent; @@ -124,3 +124,4 @@ class Session ExecutionMode execution_mode_ = ExecutionMode::TUPLE_ITERATOR; }; +} \ No newline at end of file diff --git a/src/observer/session/session_stage.cpp b/src/observer/session/session_stage.cpp index eed271357..5399f1a97 100644 --- a/src/observer/session/session_stage.cpp +++ b/src/observer/session/session_stage.cpp @@ -27,7 +27,7 @@ See the Mulan PSL v2 for more details. */ #include "session/session.h" using namespace common; - +namespace oceanbase{ // Destructor SessionStage::~SessionStage() {} @@ -111,3 +111,4 @@ RC SessionStage::handle_sql(SQLStageEvent *sql_event) return rc; } +} \ No newline at end of file diff --git a/src/observer/session/session_stage.h b/src/observer/session/session_stage.h index 2762c66ca..0293e37f9 100644 --- a/src/observer/session/session_stage.h +++ b/src/observer/session/session_stage.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse_stage.h" #include "sql/parser/resolve_stage.h" #include "sql/query_cache/query_cache_stage.h" - +namespace oceanbase{ /** * @brief SEDA处理的stage * @defgroup SQLStage @@ -56,3 +56,4 @@ class SessionStage OptimizeStage optimize_stage_; ExecuteStage execute_stage_; }; +} \ No newline at end of file diff --git a/src/observer/session/thread_data.cpp b/src/observer/session/thread_data.cpp index 96a3d963b..283ef86a5 100644 --- a/src/observer/session/thread_data.cpp +++ b/src/observer/session/thread_data.cpp @@ -14,7 +14,8 @@ See the Mulan PSL v2 for more details. */ #include "session/thread_data.h" #include "session/session.h" - +namespace oceanbase{ thread_local ThreadData *ThreadData::thread_data_; -Trx *ThreadData::trx() const { return (session_ == nullptr) ? nullptr : session_->current_trx(); } \ No newline at end of file +Trx *ThreadData::trx() const { return (session_ == nullptr) ? nullptr : session_->current_trx(); } +} \ No newline at end of file diff --git a/src/observer/session/thread_data.h b/src/observer/session/thread_data.h index 698c4b1a5..ca5c3d004 100644 --- a/src/observer/session/thread_data.h +++ b/src/observer/session/thread_data.h @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // #pragma once - +namespace oceanbase{ class Trx; class Session; @@ -37,4 +37,5 @@ class ThreadData private: Session *session_ = nullptr; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/executor/analyze_table_executor.cpp b/src/observer/sql/executor/analyze_table_executor.cpp index cb724da98..e32c814e4 100644 --- a/src/observer/sql/executor/analyze_table_executor.cpp +++ b/src/observer/sql/executor/analyze_table_executor.cpp @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record_scanner.h" using namespace std; - +namespace oceanbase{ RC AnalyzeTableExecutor::execute(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; @@ -70,3 +70,4 @@ AnalyzeTableExecutor::~AnalyzeTableExecutor() scanner_ = nullptr; } } +} \ No newline at end of file diff --git a/src/observer/sql/executor/analyze_table_executor.h b/src/observer/sql/executor/analyze_table_executor.h index 15e8f58b5..36b401339 100644 --- a/src/observer/sql/executor/analyze_table_executor.h +++ b/src/observer/sql/executor/analyze_table_executor.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" - +namespace oceanbase{ class SQLStageEvent; class RecordScanner; @@ -30,3 +30,4 @@ class AnalyzeTableExecutor private: RecordScanner *scanner_ = nullptr; }; +} \ No newline at end of file diff --git a/src/observer/sql/executor/command_executor.cpp b/src/observer/sql/executor/command_executor.cpp index de9527afe..5913577a2 100644 --- a/src/observer/sql/executor/command_executor.cpp +++ b/src/observer/sql/executor/command_executor.cpp @@ -26,7 +26,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/executor/trx_begin_executor.h" #include "sql/executor/trx_end_executor.h" #include "sql/stmt/stmt.h" - +namespace oceanbase{ RC CommandExecutor::execute(SQLStageEvent *sql_event) { Stmt *stmt = sql_event->stmt(); @@ -102,3 +102,4 @@ RC CommandExecutor::execute(SQLStageEvent *sql_event) return rc; } +} diff --git a/src/observer/sql/executor/command_executor.h b/src/observer/sql/executor/command_executor.h index d0114c4c1..acba7617e 100644 --- a/src/observer/sql/executor/command_executor.h +++ b/src/observer/sql/executor/command_executor.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" - +namespace oceanbase{ class SQLStageEvent; /** @@ -35,3 +35,4 @@ class CommandExecutor RC execute(SQLStageEvent *sql_event); }; +} \ No newline at end of file diff --git a/src/observer/sql/executor/create_index_executor.cpp b/src/observer/sql/executor/create_index_executor.cpp index 6c99dda0b..26d7abea3 100644 --- a/src/observer/sql/executor/create_index_executor.cpp +++ b/src/observer/sql/executor/create_index_executor.cpp @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "session/session.h" #include "sql/stmt/create_index_stmt.h" #include "storage/table/table.h" - +namespace oceanbase{ RC CreateIndexExecutor::execute(SQLStageEvent *sql_event) { Stmt *stmt = sql_event->stmt(); @@ -33,4 +33,5 @@ RC CreateIndexExecutor::execute(SQLStageEvent *sql_event) Trx *trx = session->current_trx(); Table *table = create_index_stmt->table(); return table->create_index(trx, create_index_stmt->field_meta(), create_index_stmt->index_name().c_str()); +} } \ No newline at end of file diff --git a/src/observer/sql/executor/create_index_executor.h b/src/observer/sql/executor/create_index_executor.h index 6a7c54896..a3a72079c 100644 --- a/src/observer/sql/executor/create_index_executor.h +++ b/src/observer/sql/executor/create_index_executor.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" - +namespace oceanbase{ class SQLStageEvent; /** @@ -31,3 +31,4 @@ class CreateIndexExecutor RC execute(SQLStageEvent *sql_event); }; +} \ No newline at end of file diff --git a/src/observer/sql/executor/create_table_executor.cpp b/src/observer/sql/executor/create_table_executor.cpp index d01d8da76..8437a2a38 100644 --- a/src/observer/sql/executor/create_table_executor.cpp +++ b/src/observer/sql/executor/create_table_executor.cpp @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ #include "session/session.h" #include "sql/stmt/create_table_stmt.h" #include "storage/db/db.h" - +namespace oceanbase{ RC CreateTableExecutor::execute(SQLStageEvent *sql_event) { Stmt *stmt = sql_event->stmt(); @@ -35,4 +35,5 @@ RC CreateTableExecutor::execute(SQLStageEvent *sql_event) RC rc = session->get_current_db()->create_table(table_name, create_table_stmt->attr_infos(), create_table_stmt->primary_keys(), create_table_stmt->storage_format()); return rc; +} } \ No newline at end of file diff --git a/src/observer/sql/executor/create_table_executor.h b/src/observer/sql/executor/create_table_executor.h index 3a7ace584..42f600efa 100644 --- a/src/observer/sql/executor/create_table_executor.h +++ b/src/observer/sql/executor/create_table_executor.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" - +namespace oceanbase{ class SQLStageEvent; /** @@ -30,3 +30,4 @@ class CreateTableExecutor RC execute(SQLStageEvent *sql_event); }; +} \ No newline at end of file diff --git a/src/observer/sql/executor/desc_table_executor.cpp b/src/observer/sql/executor/desc_table_executor.cpp index ea993fa51..1e0a9bfe9 100644 --- a/src/observer/sql/executor/desc_table_executor.cpp +++ b/src/observer/sql/executor/desc_table_executor.cpp @@ -24,7 +24,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table.h" using namespace std; - +namespace oceanbase{ RC DescTableExecutor::execute(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; @@ -64,3 +64,4 @@ RC DescTableExecutor::execute(SQLStageEvent *sql_event) } return rc; } +} \ No newline at end of file diff --git a/src/observer/sql/executor/desc_table_executor.h b/src/observer/sql/executor/desc_table_executor.h index 7e6a40951..83eb49e7b 100644 --- a/src/observer/sql/executor/desc_table_executor.h +++ b/src/observer/sql/executor/desc_table_executor.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" - +namespace oceanbase{ class SQLStageEvent; /** @@ -30,3 +30,4 @@ class DescTableExecutor RC execute(SQLStageEvent *sql_event); }; +} \ No newline at end of file diff --git a/src/observer/sql/executor/execute_stage.cpp b/src/observer/sql/executor/execute_stage.cpp index f4354b32f..afb341b77 100644 --- a/src/observer/sql/executor/execute_stage.cpp +++ b/src/observer/sql/executor/execute_stage.cpp @@ -24,7 +24,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/default/default_handler.h" using namespace common; - +namespace oceanbase{ RC ExecuteStage::handle_request(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; @@ -58,3 +58,4 @@ RC ExecuteStage::handle_request_with_physical_operator(SQLStageEvent *sql_event) sql_result->set_operator(std::move(physical_operator)); return rc; } +} \ No newline at end of file diff --git a/src/observer/sql/executor/execute_stage.h b/src/observer/sql/executor/execute_stage.h index 5eca68161..e62251874 100644 --- a/src/observer/sql/executor/execute_stage.h +++ b/src/observer/sql/executor/execute_stage.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" - +namespace oceanbase{ class SQLStageEvent; class SessionEvent; class SelectStmt; @@ -32,3 +32,4 @@ class ExecuteStage RC handle_request(SQLStageEvent *event); RC handle_request_with_physical_operator(SQLStageEvent *sql_event); }; +} \ No newline at end of file diff --git a/src/observer/sql/executor/help_executor.h b/src/observer/sql/executor/help_executor.h index c5946aa9b..edbe32cc9 100644 --- a/src/observer/sql/executor/help_executor.h +++ b/src/observer/sql/executor/help_executor.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "event/sql_event.h" #include "sql/executor/sql_result.h" #include "sql/operator/string_list_physical_operator.h" - +namespace oceanbase{ /** * @brief Help语句执行器 * @ingroup Executor @@ -57,3 +57,4 @@ class HelpExecutor return RC::SUCCESS; } }; +} \ No newline at end of file diff --git a/src/observer/sql/executor/load_data_executor.cpp b/src/observer/sql/executor/load_data_executor.cpp index f841a8474..142d7a16f 100644 --- a/src/observer/sql/executor/load_data_executor.cpp +++ b/src/observer/sql/executor/load_data_executor.cpp @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/common/chunk.h" using namespace common; - +namespace oceanbase{ RC LoadDataExecutor::execute(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; @@ -147,3 +147,4 @@ void LoadDataExecutor::load_data(Table *table, const char *file_name, char termi LOG_INFO("load data done. row num: %s, result: %s", insertion_count, strrc(rc)); sql_result->set_return_code(RC::SUCCESS); } +} \ No newline at end of file diff --git a/src/observer/sql/executor/load_data_executor.h b/src/observer/sql/executor/load_data_executor.h index 42f54d7dc..c9494b700 100644 --- a/src/observer/sql/executor/load_data_executor.h +++ b/src/observer/sql/executor/load_data_executor.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" - +namespace oceanbase{ class SQLStageEvent; class Table; class SqlResult; @@ -35,3 +35,4 @@ class LoadDataExecutor private: void load_data(Table *table, const char *file_name, char terminated, char enclosed, SqlResult *sql_result); }; +} \ No newline at end of file diff --git a/src/observer/sql/executor/set_variable_executor.cpp b/src/observer/sql/executor/set_variable_executor.cpp index 28b4a9df8..06e6bc54f 100644 --- a/src/observer/sql/executor/set_variable_executor.cpp +++ b/src/observer/sql/executor/set_variable_executor.cpp @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "sql/executor/set_variable_executor.h" - +namespace oceanbase{ RC SetVariableExecutor::execute(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; @@ -112,3 +112,4 @@ RC SetVariableExecutor::get_execution_mode(const Value &var_value, ExecutionMode return rc; } +} \ No newline at end of file diff --git a/src/observer/sql/executor/set_variable_executor.h b/src/observer/sql/executor/set_variable_executor.h index 55e45f757..4ec12af18 100644 --- a/src/observer/sql/executor/set_variable_executor.h +++ b/src/observer/sql/executor/set_variable_executor.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "event/sql_event.h" #include "session/session.h" #include "sql/stmt/set_variable_stmt.h" - +namespace oceanbase{ /** * @brief SetVariable语句执行器 * @ingroup Executor @@ -37,3 +37,4 @@ class SetVariableExecutor RC get_execution_mode(const Value &var_value, ExecutionMode &execution_mode) const; }; +} \ No newline at end of file diff --git a/src/observer/sql/executor/show_tables_executor.h b/src/observer/sql/executor/show_tables_executor.h index 0b6acf6ca..d33813dcc 100644 --- a/src/observer/sql/executor/show_tables_executor.h +++ b/src/observer/sql/executor/show_tables_executor.h @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/executor/sql_result.h" #include "sql/operator/string_list_physical_operator.h" #include "storage/db/db.h" - +namespace oceanbase{ /** * @brief 显示所有表的执行器 * @ingroup Executor @@ -56,3 +56,4 @@ class ShowTablesExecutor return RC::SUCCESS; } }; +} \ No newline at end of file diff --git a/src/observer/sql/executor/sql_result.cpp b/src/observer/sql/executor/sql_result.cpp index 7207679a8..2dc782c6f 100644 --- a/src/observer/sql/executor/sql_result.cpp +++ b/src/observer/sql/executor/sql_result.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "session/session.h" #include "storage/trx/trx.h" - +namespace oceanbase{ SqlResult::SqlResult(Session *session) : session_(session) {} void SqlResult::set_tuple_schema(const TupleSchema &schema) { tuple_schema_ = schema; } @@ -82,3 +82,4 @@ void SqlResult::set_operator(unique_ptr oper) operator_ = std::move(oper); operator_->tuple_schema(tuple_schema_); } +} \ No newline at end of file diff --git a/src/observer/sql/executor/sql_result.h b/src/observer/sql/executor/sql_result.h index e3ac999d5..9349a368c 100644 --- a/src/observer/sql/executor/sql_result.h +++ b/src/observer/sql/executor/sql_result.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/memory.h" #include "sql/expr/tuple.h" #include "sql/operator/physical_operator.h" - +namespace oceanbase{ class Session; /** @@ -57,3 +57,4 @@ class SqlResult RC return_code_ = RC::SUCCESS; string state_string_; }; +} \ No newline at end of file diff --git a/src/observer/sql/executor/trx_begin_executor.h b/src/observer/sql/executor/trx_begin_executor.h index 87f3d2d88..b6ec71c8c 100644 --- a/src/observer/sql/executor/trx_begin_executor.h +++ b/src/observer/sql/executor/trx_begin_executor.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "event/sql_event.h" #include "session/session.h" #include "storage/trx/trx.h" - +namespace oceanbase{ /** * @brief 事务开始语句的执行器 * @ingroup Executor @@ -42,3 +42,4 @@ class TrxBeginExecutor return trx->start_if_need(); } }; +} \ No newline at end of file diff --git a/src/observer/sql/executor/trx_end_executor.h b/src/observer/sql/executor/trx_end_executor.h index aa149f8c3..66209559a 100644 --- a/src/observer/sql/executor/trx_end_executor.h +++ b/src/observer/sql/executor/trx_end_executor.h @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ #include "session/session.h" #include "sql/stmt/stmt.h" #include "storage/trx/trx.h" - +namespace oceanbase{ /** * @brief 事务结束的执行器，可以是提交或回滚 * @ingroup Executor @@ -50,3 +50,4 @@ class TrxEndExecutor return rc; } }; +} \ No newline at end of file diff --git a/src/observer/sql/expr/aggregate_hash_table.cpp b/src/observer/sql/expr/aggregate_hash_table.cpp index 46aaaf993..92f952082 100644 --- a/src/observer/sql/expr/aggregate_hash_table.cpp +++ b/src/observer/sql/expr/aggregate_hash_table.cpp @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/aggregate_state.h" // ----------------------------------StandardAggregateHashTable------------------ - +namespace oceanbase{ RC StandardAggregateHashTable::add_chunk(Chunk &groups_chunk, Chunk &aggrs_chunk) { if (groups_chunk.rows() != aggrs_chunk.rows()) { @@ -287,3 +287,4 @@ const int LinearProbingAggregateHashTable::DEFAULT_CAPACITY = 16384; template class LinearProbingAggregateHashTable; template class LinearProbingAggregateHashTable; #endif +} \ No newline at end of file diff --git a/src/observer/sql/expr/aggregate_hash_table.h b/src/observer/sql/expr/aggregate_hash_table.h index 8b47d390f..96df9d73b 100644 --- a/src/observer/sql/expr/aggregate_hash_table.h +++ b/src/observer/sql/expr/aggregate_hash_table.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "common/math/simd_util.h" #include "common/sys/rc.h" #include "sql/expr/expression.h" - +namespace oceanbase{ /** * @brief 用于hash group by 的哈希表实现，不支持并发访问。 */ @@ -176,3 +176,4 @@ class LinearProbingAggregateHashTable : public AggregateHashTable AggregateExpr::Type aggregate_type_; }; #endif // USE_SIMD +} \ No newline at end of file diff --git a/src/observer/sql/expr/aggregate_state.cpp b/src/observer/sql/expr/aggregate_state.cpp index 78db6e0c9..347b5a314 100644 --- a/src/observer/sql/expr/aggregate_state.cpp +++ b/src/observer/sql/expr/aggregate_state.cpp @@ -14,6 +14,7 @@ See the Mulan PSL v2 for more details. */ #ifdef USE_SIMD #include "common/math/simd_util.h" #endif +namespace oceanbase{ template void SumState::update(const T *values, int size) { @@ -190,3 +191,4 @@ template class CountState; template class AvgState; template class AvgState; +} \ No newline at end of file diff --git a/src/observer/sql/expr/aggregate_state.h b/src/observer/sql/expr/aggregate_state.h index 6a9835ead..839d79b74 100644 --- a/src/observer/sql/expr/aggregate_state.h +++ b/src/observer/sql/expr/aggregate_state.h @@ -10,6 +10,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "common/type/attr_type.h" +namespace oceanbase{ template class SumState { @@ -65,4 +66,5 @@ void *create_aggregate_state(AggregateExpr::Type aggr_type, AttrType attr_type); RC aggregate_state_update_by_value(void *state, AggregateExpr::Type aggr_type, AttrType attr_type, const Value &val); RC aggregate_state_update_by_column(void *state, AggregateExpr::Type aggr_type, AttrType attr_type, Column &col); -RC finialize_aggregate_state(void *state, AggregateExpr::Type aggr_type, AttrType attr_type, Column &col); \ No newline at end of file +RC finialize_aggregate_state(void *state, AggregateExpr::Type aggr_type, AttrType attr_type, Column &col); +} \ No newline at end of file diff --git a/src/observer/sql/expr/aggregator.cpp b/src/observer/sql/expr/aggregator.cpp index 29ba468a7..5ca6ae3f1 100644 --- a/src/observer/sql/expr/aggregator.cpp +++ b/src/observer/sql/expr/aggregator.cpp @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/aggregator.h" #include "common/log/log.h" - +namespace oceanbase{ RC SumAggregator::accumulate(const Value &value) { if (value_.attr_type() == AttrType::UNDEFINED) { @@ -34,3 +34,4 @@ RC SumAggregator::evaluate(Value& result) result = value_; return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/sql/expr/aggregator.h b/src/observer/sql/expr/aggregator.h index 08a9b8ae3..003d6fb4c 100644 --- a/src/observer/sql/expr/aggregator.h +++ b/src/observer/sql/expr/aggregator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/value.h" #include "common/sys/rc.h" - +namespace oceanbase{ class Aggregator { public: @@ -35,3 +35,4 @@ class SumAggregator : public Aggregator RC accumulate(const Value &value) override; RC evaluate(Value &result) override; }; +} \ No newline at end of file diff --git a/src/observer/sql/expr/arithmetic_operator.hpp b/src/observer/sql/expr/arithmetic_operator.hpp index e5560703a..97729de6a 100644 --- a/src/observer/sql/expr/arithmetic_operator.hpp +++ b/src/observer/sql/expr/arithmetic_operator.hpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #endif #include "storage/common/column.h" - +namespace oceanbase{ struct Equal { template @@ -372,3 +372,4 @@ void compare_result(T *left, T *right, int n, vector &result, CompOp op default: break; } } +} \ No newline at end of file diff --git a/src/observer/sql/expr/composite_tuple.cpp b/src/observer/sql/expr/composite_tuple.cpp index 40ff81284..1fe391f73 100644 --- a/src/observer/sql/expr/composite_tuple.cpp +++ b/src/observer/sql/expr/composite_tuple.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" using namespace std; - +namespace oceanbase{ int CompositeTuple::cell_num() const { int num = 0; @@ -68,4 +68,5 @@ Tuple &CompositeTuple::tuple_at(size_t index) { ASSERT(index < tuples_.size(), "index=%d, tuples_size=%d", index, tuples_.size()); return *tuples_[index]; +} } \ No newline at end of file diff --git a/src/observer/sql/expr/composite_tuple.h b/src/observer/sql/expr/composite_tuple.h index f8883295d..a51159c80 100644 --- a/src/observer/sql/expr/composite_tuple.h +++ b/src/observer/sql/expr/composite_tuple.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/expr/tuple.h" - +namespace oceanbase{ /** * @brief 组合的Tuple * @ingroup Tuple @@ -48,3 +48,4 @@ class CompositeTuple : public Tuple private: vector> tuples_; }; +} \ No newline at end of file diff --git a/src/observer/sql/expr/expression.cpp b/src/observer/sql/expr/expression.cpp index df5d1c807..6a8b3c5c2 100644 --- a/src/observer/sql/expr/expression.cpp +++ b/src/observer/sql/expr/expression.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/arithmetic_operator.hpp" using namespace std; - +namespace oceanbase{ RC FieldExpr::get_value(const Tuple &tuple, Value &value) const { return tuple.find_cell(TupleCellSpec(table_name(), field_name()), value); @@ -628,3 +628,4 @@ RC AggregateExpr::type_from_string(const char *type_str, AggregateExpr::Type &ty } return rc; } +} \ No newline at end of file diff --git a/src/observer/sql/expr/expression.h b/src/observer/sql/expr/expression.h index 02dc27c2f..03e80c3bd 100644 --- a/src/observer/sql/expr/expression.h +++ b/src/observer/sql/expr/expression.h @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field.h" #include "sql/expr/aggregator.h" #include "storage/common/chunk.h" - +namespace oceanbase{ class Tuple; /** @@ -528,3 +528,4 @@ class AggregateExpr : public Expression Type aggregate_type_; unique_ptr child_; }; +} \ No newline at end of file diff --git a/src/observer/sql/expr/expression_iterator.cpp b/src/observer/sql/expr/expression_iterator.cpp index ca8cd6d5e..429d8af5b 100644 --- a/src/observer/sql/expr/expression_iterator.cpp +++ b/src/observer/sql/expr/expression_iterator.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" using namespace std; - +namespace oceanbase{ RC ExpressionIterator::iterate_child_expr(Expression &expr, function &)> callback) { RC rc = RC::SUCCESS; @@ -77,4 +77,5 @@ RC ExpressionIterator::iterate_child_expr(Expression &expr, function &)> callback); }; +} \ No newline at end of file diff --git a/src/observer/sql/expr/expression_tuple.h b/src/observer/sql/expr/expression_tuple.h index c70cd4fc2..6c5195264 100644 --- a/src/observer/sql/expr/expression_tuple.h +++ b/src/observer/sql/expr/expression_tuple.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/tuple.h" #include "common/value.h" #include "common/sys/rc.h" - +namespace oceanbase{ template class ExpressionTuple : public Tuple { @@ -88,3 +88,4 @@ class ExpressionTuple : public Tuple const vector &expressions_; const Tuple *child_tuple_ = nullptr; }; +} \ No newline at end of file diff --git a/src/observer/sql/expr/tuple.h b/src/observer/sql/expr/tuple.h index 053aa9a91..58fe4d5e3 100644 --- a/src/observer/sql/expr/tuple.h +++ b/src/observer/sql/expr/tuple.h @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse.h" #include "common/value.h" #include "storage/record/record.h" - +namespace oceanbase{ class Table; /** @@ -440,3 +440,4 @@ class JoinedTuple : public Tuple Tuple *left_ = nullptr; Tuple *right_ = nullptr; }; +} \ No newline at end of file diff --git a/src/observer/sql/expr/tuple_cell.cpp b/src/observer/sql/expr/tuple_cell.cpp index 4646643dd..a2ae3a04a 100644 --- a/src/observer/sql/expr/tuple_cell.cpp +++ b/src/observer/sql/expr/tuple_cell.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" using namespace std; - +namespace oceanbase{ TupleCellSpec::TupleCellSpec(const char *table_name, const char *field_name, const char *alias) { if (table_name) { @@ -45,3 +45,4 @@ TupleCellSpec::TupleCellSpec(const char *alias) TupleCellSpec::TupleCellSpec(const string &alias) : alias_(alias) {} +} \ No newline at end of file diff --git a/src/observer/sql/expr/tuple_cell.h b/src/observer/sql/expr/tuple_cell.h index 3268f2f29..364df2224 100644 --- a/src/observer/sql/expr/tuple_cell.h +++ b/src/observer/sql/expr/tuple_cell.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "storage/field/field_meta.h" - +namespace oceanbase{ class TupleCellSpec final { public: @@ -38,3 +38,4 @@ class TupleCellSpec final string field_name_; string alias_; }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/aggregate_vec_physical_operator.cpp b/src/observer/sql/operator/aggregate_vec_physical_operator.cpp index cace563a4..c901eb6e0 100644 --- a/src/observer/sql/operator/aggregate_vec_physical_operator.cpp +++ b/src/observer/sql/operator/aggregate_vec_physical_operator.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/composite_tuple.h" using namespace common; - +namespace oceanbase{ AggregateVecPhysicalOperator::AggregateVecPhysicalOperator(vector &&expressions) { aggregate_expressions_ = std::move(expressions); @@ -108,3 +108,4 @@ RC AggregateVecPhysicalOperator::close() LOG_INFO("close group by operator"); return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/sql/operator/aggregate_vec_physical_operator.h b/src/observer/sql/operator/aggregate_vec_physical_operator.h index 1afab13f2..afd91e1bc 100644 --- a/src/observer/sql/operator/aggregate_vec_physical_operator.h +++ b/src/observer/sql/operator/aggregate_vec_physical_operator.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/physical_operator.h" - +namespace oceanbase{ /** * @brief 聚合物理算子 (Vectorized) * @ingroup PhysicalOperator @@ -66,3 +66,4 @@ class AggregateVecPhysicalOperator : public PhysicalOperator AggregateValues aggr_values_; bool outputed_ = false; }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/calc_logical_operator.h b/src/observer/sql/operator/calc_logical_operator.h index 985dd388d..1372decf9 100644 --- a/src/observer/sql/operator/calc_logical_operator.h +++ b/src/observer/sql/operator/calc_logical_operator.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/logical_operator.h" - +namespace oceanbase{ /** * @brief 逻辑算子描述当前执行计划要做什么 * @details 可以看OptimizeStage中相关的代码 @@ -29,3 +29,4 @@ class CalcLogicalOperator : public LogicalOperator LogicalOperatorType type() const override { return LogicalOperatorType::CALC; } OpType get_op_type() const override { return OpType::LOGICALCALCULATE; } }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/calc_physical_operator.h b/src/observer/sql/operator/calc_physical_operator.h index 4b704af80..0d6aca7b0 100644 --- a/src/observer/sql/operator/calc_physical_operator.h +++ b/src/observer/sql/operator/calc_physical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression_tuple.h" #include "sql/operator/physical_operator.h" - +namespace oceanbase{ class CalcPhysicalOperator : public PhysicalOperator { public: @@ -73,3 +73,4 @@ class CalcPhysicalOperator : public PhysicalOperator ExpressionTuple> tuple_; bool emitted_ = false; }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/delete_logical_operator.cpp b/src/observer/sql/operator/delete_logical_operator.cpp index 5fc03f34e..099410559 100644 --- a/src/observer/sql/operator/delete_logical_operator.cpp +++ b/src/observer/sql/operator/delete_logical_operator.cpp @@ -13,5 +13,6 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/delete_logical_operator.h" - +namespace oceanbase{ DeleteLogicalOperator::DeleteLogicalOperator(Table *table) : table_(table) {} +} \ No newline at end of file diff --git a/src/observer/sql/operator/delete_logical_operator.h b/src/observer/sql/operator/delete_logical_operator.h index effc305c9..b35a5a72b 100644 --- a/src/observer/sql/operator/delete_logical_operator.h +++ b/src/observer/sql/operator/delete_logical_operator.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/logical_operator.h" - +namespace oceanbase{ /** * @brief 逻辑算子，用于执行delete语句 * @ingroup LogicalOperator @@ -33,3 +33,4 @@ class DeleteLogicalOperator : public LogicalOperator private: Table *table_ = nullptr; }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/delete_physical_operator.cpp b/src/observer/sql/operator/delete_physical_operator.cpp index ea239a9b0..88dc51c76 100644 --- a/src/observer/sql/operator/delete_physical_operator.cpp +++ b/src/observer/sql/operator/delete_physical_operator.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "storage/table/table.h" #include "storage/trx/trx.h" - +namespace oceanbase{ RC DeletePhysicalOperator::open(Trx *trx) { if (children_.empty()) { @@ -69,3 +69,4 @@ RC DeletePhysicalOperator::close() { return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/sql/operator/delete_physical_operator.h b/src/observer/sql/operator/delete_physical_operator.h index 241447985..cb1e30862 100644 --- a/src/observer/sql/operator/delete_physical_operator.h +++ b/src/observer/sql/operator/delete_physical_operator.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/physical_operator.h" - +namespace oceanbase{ class Trx; class DeleteStmt; @@ -45,3 +45,4 @@ class DeletePhysicalOperator : public PhysicalOperator Trx *trx_ = nullptr; vector records_; }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/explain_logical_operator.h b/src/observer/sql/operator/explain_logical_operator.h index c226f0f9b..29576b6e8 100644 --- a/src/observer/sql/operator/explain_logical_operator.h +++ b/src/observer/sql/operator/explain_logical_operator.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/logical_operator.h" - +namespace oceanbase{ /** * @brief Explain逻辑算子 * @ingroup LogicalOperator @@ -30,3 +30,4 @@ class ExplainLogicalOperator : public LogicalOperator OpType get_op_type() const override { return OpType::LOGICALEXPLAIN; } }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/explain_physical_operator.cpp b/src/observer/sql/operator/explain_physical_operator.cpp index 1ff2933a3..48dee4f22 100644 --- a/src/observer/sql/operator/explain_physical_operator.cpp +++ b/src/observer/sql/operator/explain_physical_operator.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" using namespace std; - +namespace oceanbase{ RC ExplainPhysicalOperator::open(Trx *) { ASSERT(children_.size() == 1, "explain must has 1 child"); @@ -61,4 +61,4 @@ RC ExplainPhysicalOperator::next(Chunk &chunk) } Tuple *ExplainPhysicalOperator::current_tuple() { return &tuple_; } - +} diff --git a/src/observer/sql/operator/explain_physical_operator.h b/src/observer/sql/operator/explain_physical_operator.h index 10c1b6d7a..b86ba5e63 100644 --- a/src/observer/sql/operator/explain_physical_operator.h +++ b/src/observer/sql/operator/explain_physical_operator.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/physical_operator.h" - +namespace oceanbase{ /** * @brief Explain物理算子 * @ingroup PhysicalOperator @@ -54,3 +54,4 @@ class ExplainPhysicalOperator : public PhysicalOperator string physical_plan_; ValueListTuple tuple_; }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/expr_vec_physical_operator.cpp b/src/observer/sql/operator/expr_vec_physical_operator.cpp index 64a3a99bb..05f3209e8 100644 --- a/src/observer/sql/operator/expr_vec_physical_operator.cpp +++ b/src/observer/sql/operator/expr_vec_physical_operator.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; - +namespace oceanbase{ ExprVecPhysicalOperator::ExprVecPhysicalOperator(vector &&expressions) { expressions_ = std::move(expressions); @@ -60,3 +60,4 @@ RC ExprVecPhysicalOperator::close() LOG_INFO("close group by operator"); return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/sql/operator/expr_vec_physical_operator.h b/src/observer/sql/operator/expr_vec_physical_operator.h index bbd5a9a91..252e6faa7 100644 --- a/src/observer/sql/operator/expr_vec_physical_operator.h +++ b/src/observer/sql/operator/expr_vec_physical_operator.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/physical_operator.h" - +namespace oceanbase{ /** * @brief 表达式物理算子(Vectorized) * @ingroup PhysicalOperator @@ -34,3 +34,4 @@ class ExprVecPhysicalOperator : public PhysicalOperator Chunk chunk_; Chunk evaled_chunk_; }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/group_by_logical_operator.cpp b/src/observer/sql/operator/group_by_logical_operator.cpp index 5d86d847c..6b5d80a34 100644 --- a/src/observer/sql/operator/group_by_logical_operator.cpp +++ b/src/observer/sql/operator/group_by_logical_operator.cpp @@ -17,10 +17,11 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" using namespace std; - +namespace oceanbase{ GroupByLogicalOperator::GroupByLogicalOperator(vector> &&group_by_exprs, vector &&expressions) { group_by_expressions_ = std::move(group_by_exprs); aggregate_expressions_ = std::move(expressions); } +} \ No newline at end of file diff --git a/src/observer/sql/operator/group_by_logical_operator.h b/src/observer/sql/operator/group_by_logical_operator.h index 6e533e906..a8a93c5c4 100644 --- a/src/observer/sql/operator/group_by_logical_operator.h +++ b/src/observer/sql/operator/group_by_logical_operator.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/logical_operator.h" - +namespace oceanbase{ class GroupByLogicalOperator : public LogicalOperator { public: @@ -33,3 +33,4 @@ class GroupByLogicalOperator : public LogicalOperator vector> group_by_expressions_; vector aggregate_expressions_; ///< 输出的表达式，可能包含聚合函数 }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/group_by_physical_operator.cpp b/src/observer/sql/operator/group_by_physical_operator.cpp index 75301f2b6..cb0ecfad6 100644 --- a/src/observer/sql/operator/group_by_physical_operator.cpp +++ b/src/observer/sql/operator/group_by_physical_operator.cpp @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; - +namespace oceanbase{ GroupByPhysicalOperator::GroupByPhysicalOperator(vector &&expressions) { aggregate_expressions_ = std::move(expressions); @@ -102,3 +102,4 @@ RC GroupByPhysicalOperator::evaluate(GroupValueType &group_value) return rc; } +} \ No newline at end of file diff --git a/src/observer/sql/operator/group_by_physical_operator.h b/src/observer/sql/operator/group_by_physical_operator.h index 5c7a8f3ef..0a108013b 100644 --- a/src/observer/sql/operator/group_by_physical_operator.h +++ b/src/observer/sql/operator/group_by_physical_operator.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/tuple.h" #include "sql/operator/physical_operator.h" #include "sql/expr/composite_tuple.h" - +namespace oceanbase{ /** * @brief Group By 物理算子基类 * @ingroup PhysicalOperator @@ -56,3 +56,4 @@ class GroupByPhysicalOperator : public PhysicalOperator vector aggregate_expressions_; /// 聚合表达式 vector value_expressions_; /// 计算聚合时的表达式 }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/group_by_vec_physical_operator.h b/src/observer/sql/operator/group_by_vec_physical_operator.h index fe00deec7..d6fbe175a 100644 --- a/src/observer/sql/operator/group_by_vec_physical_operator.h +++ b/src/observer/sql/operator/group_by_vec_physical_operator.h @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/aggregate_hash_table.h" #include "sql/operator/physical_operator.h" - +namespace oceanbase{ /** * @brief Group By 物理算子(vectorized) * @ingroup PhysicalOperator @@ -32,3 +32,4 @@ class GroupByVecPhysicalOperator : public PhysicalOperator private: }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/hash_group_by_physical_operator.cpp b/src/observer/sql/operator/hash_group_by_physical_operator.cpp index f408c0ec9..678a13e07 100644 --- a/src/observer/sql/operator/hash_group_by_physical_operator.cpp +++ b/src/observer/sql/operator/hash_group_by_physical_operator.cpp @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; - +namespace oceanbase{ HashGroupByPhysicalOperator::HashGroupByPhysicalOperator( vector> &&group_by_exprs, vector &&expressions) : GroupByPhysicalOperator(std::move(expressions)), group_by_exprs_(std::move(group_by_exprs)) @@ -176,4 +176,5 @@ RC HashGroupByPhysicalOperator::find_group(const Tuple &child_tuple, GroupType * } return rc; +} } \ No newline at end of file diff --git a/src/observer/sql/operator/hash_group_by_physical_operator.h b/src/observer/sql/operator/hash_group_by_physical_operator.h index 36431d5a9..5003c2b42 100644 --- a/src/observer/sql/operator/hash_group_by_physical_operator.h +++ b/src/observer/sql/operator/hash_group_by_physical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/group_by_physical_operator.h" #include "sql/expr/composite_tuple.h" - +namespace oceanbase{ /** * @brief Group By Hash 方式物理算子 * @ingroup PhysicalOperator @@ -60,3 +60,4 @@ class HashGroupByPhysicalOperator : public GroupByPhysicalOperator vector::iterator current_group_; bool first_emited_ = false; /// 第一条数据是否已经输出 }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/hash_join_physical_operator.h b/src/observer/sql/operator/hash_join_physical_operator.h index 4c7879aaa..6adcc21ff 100644 --- a/src/observer/sql/operator/hash_join_physical_operator.h +++ b/src/observer/sql/operator/hash_join_physical_operator.h @@ -12,10 +12,11 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "sql/parser/parse.h" - +namespace oceanbase{ /** * @brief Hash Join 算子 * @ingroup PhysicalOperator */ class HashJoinPhysicalOperator -{}; \ No newline at end of file +{}; +} \ No newline at end of file diff --git a/src/observer/sql/operator/index_scan_physical_operator.cpp b/src/observer/sql/operator/index_scan_physical_operator.cpp index 01cf7eb79..d8061c7b0 100644 --- a/src/observer/sql/operator/index_scan_physical_operator.cpp +++ b/src/observer/sql/operator/index_scan_physical_operator.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/index_scan_physical_operator.h" #include "storage/index/index.h" #include "storage/trx/trx.h" - +namespace oceanbase{ IndexScanPhysicalOperator::IndexScanPhysicalOperator(Table *table, Index *index, ReadWriteMode mode, const Value *left_value, bool left_inclusive, const Value *right_value, bool right_inclusive) : table_(table), @@ -139,3 +139,4 @@ string IndexScanPhysicalOperator::param() const { return string(index_->index_meta().name()) + " ON " + table_->name(); } +} \ No newline at end of file diff --git a/src/observer/sql/operator/index_scan_physical_operator.h b/src/observer/sql/operator/index_scan_physical_operator.h index 405e74716..1a51c52d9 100644 --- a/src/observer/sql/operator/index_scan_physical_operator.h +++ b/src/observer/sql/operator/index_scan_physical_operator.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/tuple.h" #include "sql/operator/physical_operator.h" #include "storage/record/record_manager.h" - +namespace oceanbase{ /** * @brief 索引扫描物理算子 * @ingroup PhysicalOperator @@ -63,3 +63,4 @@ class IndexScanPhysicalOperator : public PhysicalOperator vector> predicates_; }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/insert_logical_operator.cpp b/src/observer/sql/operator/insert_logical_operator.cpp index 51ad27a2e..1b9d2a6c0 100644 --- a/src/observer/sql/operator/insert_logical_operator.cpp +++ b/src/observer/sql/operator/insert_logical_operator.cpp @@ -13,6 +13,7 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/insert_logical_operator.h" - +namespace oceanbase{ InsertLogicalOperator::InsertLogicalOperator(Table *table, vector values) : table_(table), values_(values) {} +} \ No newline at end of file diff --git a/src/observer/sql/operator/insert_logical_operator.h b/src/observer/sql/operator/insert_logical_operator.h index 72df40ac5..902e6163e 100644 --- a/src/observer/sql/operator/insert_logical_operator.h +++ b/src/observer/sql/operator/insert_logical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/logical_operator.h" #include "sql/parser/parse_defs.h" - +namespace oceanbase{ /** * @brief 插入逻辑算子 * @ingroup LogicalOperator @@ -39,3 +39,4 @@ class InsertLogicalOperator : public LogicalOperator Table *table_ = nullptr; vector values_; }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/insert_physical_operator.cpp b/src/observer/sql/operator/insert_physical_operator.cpp index fd1bc9085..921474269 100644 --- a/src/observer/sql/operator/insert_physical_operator.cpp +++ b/src/observer/sql/operator/insert_physical_operator.cpp @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/trx/trx.h" using namespace std; - +namespace oceanbase{ InsertPhysicalOperator::InsertPhysicalOperator(Table *table, vector &&values) : table_(table), values_(std::move(values)) {} @@ -42,3 +42,4 @@ RC InsertPhysicalOperator::open(Trx *trx) RC InsertPhysicalOperator::next() { return RC::RECORD_EOF; } RC InsertPhysicalOperator::close() { return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/sql/operator/insert_physical_operator.h b/src/observer/sql/operator/insert_physical_operator.h index 85aedc6e5..d828a393e 100644 --- a/src/observer/sql/operator/insert_physical_operator.h +++ b/src/observer/sql/operator/insert_physical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "sql/parser/parse.h" - +namespace oceanbase{ class InsertStmt; /** @@ -44,3 +44,4 @@ class InsertPhysicalOperator : public PhysicalOperator Table *table_ = nullptr; vector values_; }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/join_logical_operator.h b/src/observer/sql/operator/join_logical_operator.h index deec7bcd8..84d3cddd5 100644 --- a/src/observer/sql/operator/join_logical_operator.h +++ b/src/observer/sql/operator/join_logical_operator.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/logical_operator.h" - +namespace oceanbase{ /** * @brief 连接算子 * @ingroup LogicalOperator @@ -73,3 +73,4 @@ class JoinLogicalOperator : public LogicalOperator LogicalOperator *predicate_op_ = nullptr; std::vector> join_predicates_; }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/join_physical_operator.cpp b/src/observer/sql/operator/join_physical_operator.cpp index 0de387301..d8a351182 100644 --- a/src/observer/sql/operator/join_physical_operator.cpp +++ b/src/observer/sql/operator/join_physical_operator.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/join_physical_operator.h" - +namespace oceanbase{ NestedLoopJoinPhysicalOperator::NestedLoopJoinPhysicalOperator() {} RC NestedLoopJoinPhysicalOperator::open(Trx *trx) @@ -131,3 +131,4 @@ RC NestedLoopJoinPhysicalOperator::right_next() joined_tuple_.set_right(right_tuple_); return rc; } +} \ No newline at end of file diff --git a/src/observer/sql/operator/join_physical_operator.h b/src/observer/sql/operator/join_physical_operator.h index 930d5f194..9371e819c 100644 --- a/src/observer/sql/operator/join_physical_operator.h +++ b/src/observer/sql/operator/join_physical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "sql/parser/parse.h" - +namespace oceanbase{ /** * @brief 最简单的两表（称为左表、右表）join算子 * @details 依次遍历左表的每一行，然后关联右表的每一行 @@ -51,3 +51,4 @@ class NestedLoopJoinPhysicalOperator : public PhysicalOperator bool round_done_ = true; //! 右表遍历的一轮是否结束 bool right_closed_ = true; //! 右表算子是否已经关闭 }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/logical_operator.cpp b/src/observer/sql/operator/logical_operator.cpp index a2fb251db..254c81c6d 100644 --- a/src/observer/sql/operator/logical_operator.cpp +++ b/src/observer/sql/operator/logical_operator.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/logical_operator.h" - +namespace oceanbase{ LogicalOperator::~LogicalOperator() {} void LogicalOperator::add_child(unique_ptr oper) { @@ -45,4 +45,4 @@ void LogicalOperator::generate_general_child() child->generate_general_child(); } } - +} diff --git a/src/observer/sql/operator/logical_operator.h b/src/observer/sql/operator/logical_operator.h index d212dbcc2..707e47197 100644 --- a/src/observer/sql/operator/logical_operator.h +++ b/src/observer/sql/operator/logical_operator.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "sql/operator/operator_node.h" #include "common/lang/unordered_set.h" - +namespace oceanbase{ /** * @brief 逻辑算子 * @defgroup LogicalOperator @@ -72,3 +72,4 @@ class LogicalOperator : public OperatorNode ///< 表达式能是一个常量，也可以是一个函数，也可以是一个列，也可以是一个子查询等等 vector> expressions_; }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/nested_loop_join_physical_operator.cpp b/src/observer/sql/operator/nested_loop_join_physical_operator.cpp index 5228d23fd..108b27b85 100644 --- a/src/observer/sql/operator/nested_loop_join_physical_operator.cpp +++ b/src/observer/sql/operator/nested_loop_join_physical_operator.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/nested_loop_join_physical_operator.h" - +namespace oceanbase{ NestedLoopJoinPhysicalOperator::NestedLoopJoinPhysicalOperator() {} RC NestedLoopJoinPhysicalOperator::open(Trx *trx) @@ -131,3 +131,4 @@ RC NestedLoopJoinPhysicalOperator::right_next() joined_tuple_.set_right(right_tuple_); return rc; } +} \ No newline at end of file diff --git a/src/observer/sql/operator/nested_loop_join_physical_operator.h b/src/observer/sql/operator/nested_loop_join_physical_operator.h index 80b455975..a9fda0f67 100644 --- a/src/observer/sql/operator/nested_loop_join_physical_operator.h +++ b/src/observer/sql/operator/nested_loop_join_physical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "sql/parser/parse.h" - +namespace oceanbase{ /** * @brief 最简单的两表（称为左表、右表）join算子 * @details 依次遍历左表的每一行，然后关联右表的每一行 @@ -62,3 +62,4 @@ class NestedLoopJoinPhysicalOperator : public PhysicalOperator bool round_done_ = true; //! 右表遍历的一轮是否结束 bool right_closed_ = true; //! 右表算子是否已经关闭 }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/operator_node.h b/src/observer/sql/operator/operator_node.h index f349f4b00..e212b2616 100644 --- a/src/observer/sql/operator/operator_node.h +++ b/src/observer/sql/operator/operator_node.h @@ -15,6 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/memory.h" #include "sql/optimizer/cascade/property.h" #include "sql/optimizer/cascade/cost_model.h" +namespace oceanbase{ /** * @brief Operator type(including logical and physical) */ @@ -141,4 +142,5 @@ class OperatorNode // TODO: refactor // cascade optimizer 中使用，为了logical/physical operator 可以统一在 cascade 中迭代 vector general_children_; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/operator/physical_operator.cpp b/src/observer/sql/operator/physical_operator.cpp index 7ff99d67c..ecb8e07cb 100644 --- a/src/observer/sql/operator/physical_operator.cpp +++ b/src/observer/sql/operator/physical_operator.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/physical_operator.h" - +namespace oceanbase{ string physical_operator_type_name(PhysicalOperatorType type) { switch (type) { @@ -41,3 +41,4 @@ string physical_operator_type_name(PhysicalOperatorType type) string PhysicalOperator::name() const { return physical_operator_type_name(type()); } string PhysicalOperator::param() const { return ""; } +} \ No newline at end of file diff --git a/src/observer/sql/operator/physical_operator.h b/src/observer/sql/operator/physical_operator.h index 8f2b67ba1..bac8c615c 100644 --- a/src/observer/sql/operator/physical_operator.h +++ b/src/observer/sql/operator/physical_operator.h @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ class Record; class TupleCellSpec; class Trx; - +namespace oceanbase{ /** * @brief 物理算子 * @defgroup PhysicalOperator @@ -93,3 +93,4 @@ class PhysicalOperator : public OperatorNode protected: vector> children_; }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/predicate_logical_operator.cpp b/src/observer/sql/operator/predicate_logical_operator.cpp index e7db87c77..0e6677205 100644 --- a/src/observer/sql/operator/predicate_logical_operator.cpp +++ b/src/observer/sql/operator/predicate_logical_operator.cpp @@ -13,8 +13,9 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/predicate_logical_operator.h" - +namespace oceanbase{ PredicateLogicalOperator::PredicateLogicalOperator(unique_ptr expression) { expressions_.emplace_back(std::move(expression)); } +} \ No newline at end of file diff --git a/src/observer/sql/operator/predicate_logical_operator.h b/src/observer/sql/operator/predicate_logical_operator.h index 115121ff9..2b449dddb 100644 --- a/src/observer/sql/operator/predicate_logical_operator.h +++ b/src/observer/sql/operator/predicate_logical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "sql/operator/logical_operator.h" - +namespace oceanbase{ /** * @brief 谓词/过滤逻辑算子 * @ingroup LogicalOperator @@ -31,3 +31,4 @@ class PredicateLogicalOperator : public LogicalOperator OpType get_op_type() const override { return OpType::LOGICALFILTER; } }; +} diff --git a/src/observer/sql/operator/predicate_physical_operator.cpp b/src/observer/sql/operator/predicate_physical_operator.cpp index 61b564451..ffed21b02 100644 --- a/src/observer/sql/operator/predicate_physical_operator.cpp +++ b/src/observer/sql/operator/predicate_physical_operator.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/filter_stmt.h" #include "storage/field/field.h" #include "storage/record/record.h" - +namespace oceanbase{ PredicatePhysicalOperator::PredicatePhysicalOperator(std::unique_ptr expr) : expression_(std::move(expr)) { ASSERT(expression_->value_type() == AttrType::BOOLEANS, "predicate's expression should be BOOLEAN type"); @@ -71,3 +71,4 @@ RC PredicatePhysicalOperator::tuple_schema(TupleSchema &schema) const { return children_[0]->tuple_schema(schema); } +} \ No newline at end of file diff --git a/src/observer/sql/operator/predicate_physical_operator.h b/src/observer/sql/operator/predicate_physical_operator.h index 49bbcbfbd..da49e2625 100644 --- a/src/observer/sql/operator/predicate_physical_operator.h +++ b/src/observer/sql/operator/predicate_physical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "sql/operator/physical_operator.h" - +namespace oceanbase{ class FilterStmt; /** @@ -44,3 +44,4 @@ class PredicatePhysicalOperator : public PhysicalOperator private: unique_ptr expression_; }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/project_logical_operator.cpp b/src/observer/sql/operator/project_logical_operator.cpp index bbd06d1be..6f31b6b33 100644 --- a/src/observer/sql/operator/project_logical_operator.cpp +++ b/src/observer/sql/operator/project_logical_operator.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/project_logical_operator.h" using namespace std; - +namespace oceanbase{ ProjectLogicalOperator::ProjectLogicalOperator(vector> &&expressions) { expressions_ = std::move(expressions); @@ -33,3 +33,4 @@ unique_ptr ProjectLogicalOperator::find_log_prop(const vector(card); } +} \ No newline at end of file diff --git a/src/observer/sql/operator/project_logical_operator.h b/src/observer/sql/operator/project_logical_operator.h index 6522ac3c1..f7ebbd165 100644 --- a/src/observer/sql/operator/project_logical_operator.h +++ b/src/observer/sql/operator/project_logical_operator.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "sql/operator/logical_operator.h" #include "storage/field/field.h" - +namespace oceanbase{ /** * @brief project 表示投影运算 * @ingroup LogicalOperator @@ -36,3 +36,4 @@ class ProjectLogicalOperator : public LogicalOperator vector> &expressions() { return expressions_; } const vector> &expressions() const { return expressions_; } }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/project_physical_operator.cpp b/src/observer/sql/operator/project_physical_operator.cpp index 9c06125b6..b64542cdc 100644 --- a/src/observer/sql/operator/project_physical_operator.cpp +++ b/src/observer/sql/operator/project_physical_operator.cpp @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table.h" using namespace std; - +namespace oceanbase{ ProjectPhysicalOperator::ProjectPhysicalOperator(vector> &&expressions) : expressions_(std::move(expressions)), tuple_(expressions_) { @@ -67,4 +67,5 @@ RC ProjectPhysicalOperator::tuple_schema(TupleSchema &schema) const schema.append_cell(expression->name()); } return RC::SUCCESS; +} } \ No newline at end of file diff --git a/src/observer/sql/operator/project_physical_operator.h b/src/observer/sql/operator/project_physical_operator.h index 781e4ee11..0563c500f 100644 --- a/src/observer/sql/operator/project_physical_operator.h +++ b/src/observer/sql/operator/project_physical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "sql/expr/expression_tuple.h" - +namespace oceanbase{ /** * @brief 选择/投影物理算子 * @ingroup PhysicalOperator @@ -51,3 +51,4 @@ class ProjectPhysicalOperator : public PhysicalOperator vector> expressions_; ExpressionTuple> tuple_; }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/project_vec_physical_operator.cpp b/src/observer/sql/operator/project_vec_physical_operator.cpp index 06a487cfb..d61d61fb0 100644 --- a/src/observer/sql/operator/project_vec_physical_operator.cpp +++ b/src/observer/sql/operator/project_vec_physical_operator.cpp @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table.h" using namespace std; - +namespace oceanbase{ ProjectVecPhysicalOperator::ProjectVecPhysicalOperator(vector> &&expressions) : expressions_(std::move(expressions)) { @@ -71,3 +71,4 @@ RC ProjectVecPhysicalOperator::tuple_schema(TupleSchema &schema) const } return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/sql/operator/project_vec_physical_operator.h b/src/observer/sql/operator/project_vec_physical_operator.h index de3f716f6..bfaa4cc0e 100644 --- a/src/observer/sql/operator/project_vec_physical_operator.h +++ b/src/observer/sql/operator/project_vec_physical_operator.h @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "sql/expr/expression_tuple.h" - +namespace oceanbase{ /** * @brief 选择/投影物理算子(vectorized) * @ingroup PhysicalOperator @@ -39,3 +39,4 @@ class ProjectVecPhysicalOperator : public PhysicalOperator vector> expressions_; Chunk chunk_; }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/scalar_group_by_physical_operator.cpp b/src/observer/sql/operator/scalar_group_by_physical_operator.cpp index d07546dbe..adc15ce68 100644 --- a/src/observer/sql/operator/scalar_group_by_physical_operator.cpp +++ b/src/observer/sql/operator/scalar_group_by_physical_operator.cpp @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; - +namespace oceanbase{ ScalarGroupByPhysicalOperator::ScalarGroupByPhysicalOperator(vector &&expressions) : GroupByPhysicalOperator(std::move(expressions)) {} @@ -117,4 +117,5 @@ Tuple *ScalarGroupByPhysicalOperator::current_tuple() } return &get<1>(*group_value_); +} } \ No newline at end of file diff --git a/src/observer/sql/operator/scalar_group_by_physical_operator.h b/src/observer/sql/operator/scalar_group_by_physical_operator.h index d55d3c507..9d2154b45 100644 --- a/src/observer/sql/operator/scalar_group_by_physical_operator.h +++ b/src/observer/sql/operator/scalar_group_by_physical_operator.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/group_by_physical_operator.h" - +namespace oceanbase{ /** * @brief 没有 group by 表达式的 group by 物理算子 * @ingroup PhysicalOperator @@ -39,3 +39,4 @@ class ScalarGroupByPhysicalOperator : public GroupByPhysicalOperator unique_ptr group_value_; bool emitted_ = false; /// 标识是否已经输出过 }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/string_list_physical_operator.h b/src/observer/sql/operator/string_list_physical_operator.h index 038aa0bea..88d81415e 100644 --- a/src/observer/sql/operator/string_list_physical_operator.h +++ b/src/observer/sql/operator/string_list_physical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/initializer_list.h" #include "sql/operator/physical_operator.h" - +namespace oceanbase{ /** * @brief 字符串列表物理算子 * @ingroup PhysicalOperator @@ -89,3 +89,4 @@ class StringListPhysicalOperator : public PhysicalOperator bool started_ = false; ValueListTuple tuple_; }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/table_get_logical_operator.cpp b/src/observer/sql/operator/table_get_logical_operator.cpp index 9917062b0..09dcc058f 100644 --- a/src/observer/sql/operator/table_get_logical_operator.cpp +++ b/src/observer/sql/operator/table_get_logical_operator.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/table_get_logical_operator.h" #include "sql/optimizer/cascade/property.h" #include "catalog/catalog.h" - +namespace oceanbase{ TableGetLogicalOperator::TableGetLogicalOperator(Table *table, ReadWriteMode mode) : LogicalOperator(), table_(table), mode_(mode) {} @@ -30,4 +30,5 @@ unique_ptr TableGetLogicalOperator::find_log_prop(const vector< int card = Catalog::get_instance().get_table_stats(table_->table_id()).row_nums; // TODO: think about predicates. return make_unique(card); +} } \ No newline at end of file diff --git a/src/observer/sql/operator/table_get_logical_operator.h b/src/observer/sql/operator/table_get_logical_operator.h index a95c25337..2dd473038 100644 --- a/src/observer/sql/operator/table_get_logical_operator.h +++ b/src/observer/sql/operator/table_get_logical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/logical_operator.h" #include "storage/field/field.h" #include "common/types.h" - +namespace oceanbase{ /** * @brief 表示从表中获取数据的算子 * @details 比如使用全表扫描、通过索引获取数据等 @@ -67,3 +67,4 @@ class TableGetLogicalOperator : public LogicalOperator // 如果有多个表达式，他们的关系都是 AND vector> predicates_; }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/table_scan_physical_operator.cpp b/src/observer/sql/operator/table_scan_physical_operator.cpp index 895966e23..129d7e04d 100644 --- a/src/observer/sql/operator/table_scan_physical_operator.cpp +++ b/src/observer/sql/operator/table_scan_physical_operator.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table.h" using namespace std; - +namespace oceanbase{ RC TableScanPhysicalOperator::open(Trx *trx) { RC rc = table_->get_record_scanner(record_scanner_, trx, mode_); @@ -100,3 +100,4 @@ RC TableScanPhysicalOperator::filter(RowTuple &tuple, bool &result) result = true; return rc; } +} \ No newline at end of file diff --git a/src/observer/sql/operator/table_scan_physical_operator.h b/src/observer/sql/operator/table_scan_physical_operator.h index d62e8e483..4419ddeb6 100644 --- a/src/observer/sql/operator/table_scan_physical_operator.h +++ b/src/observer/sql/operator/table_scan_physical_operator.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record_manager.h" #include "storage/record/record_scanner.h" #include "common/types.h" - +namespace oceanbase{ class Table; /** @@ -81,3 +81,4 @@ class TableScanPhysicalOperator : public PhysicalOperator RowTuple tuple_; vector> predicates_; // TODO chang predicate to table tuple filter }; +} \ No newline at end of file diff --git a/src/observer/sql/operator/table_scan_vec_physical_operator.cpp b/src/observer/sql/operator/table_scan_vec_physical_operator.cpp index 9744776cd..101e9fe46 100644 --- a/src/observer/sql/operator/table_scan_vec_physical_operator.cpp +++ b/src/observer/sql/operator/table_scan_vec_physical_operator.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table.h" using namespace std; - +namespace oceanbase{ RC TableScanVecPhysicalOperator::open(Trx *trx) { RC rc = table_->get_chunk_scanner(chunk_scanner_, trx, mode_); @@ -83,3 +83,4 @@ RC TableScanVecPhysicalOperator::filter(Chunk &chunk) } return rc; } +} diff --git a/src/observer/sql/operator/table_scan_vec_physical_operator.h b/src/observer/sql/operator/table_scan_vec_physical_operator.h index 8982055dd..a9e0ac1be 100644 --- a/src/observer/sql/operator/table_scan_vec_physical_operator.h +++ b/src/observer/sql/operator/table_scan_vec_physical_operator.h @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "storage/record/record_manager.h" #include "common/types.h" - +namespace oceanbase{ class Table; /** @@ -50,3 +50,4 @@ class TableScanVecPhysicalOperator : public PhysicalOperator vector select_; vector> predicates_; }; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/cost_model.cpp b/src/observer/sql/optimizer/cascade/cost_model.cpp index 16f43ec7f..ebe9efe03 100644 --- a/src/observer/sql/optimizer/cascade/cost_model.cpp +++ b/src/observer/sql/optimizer/cascade/cost_model.cpp @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/memo.h" #include "catalog/catalog.h" #include "sql/optimizer/cascade/group_expr.h" - +namespace oceanbase{ double CostModel::calculate_cost(Memo *memo, GroupExpr *gexpr) { @@ -27,4 +27,5 @@ double CostModel::calculate_cost(Memo *memo, } return op->calculate_cost(log_prop, child_log_props, this); +} } \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/cost_model.h b/src/observer/sql/optimizer/cascade/cost_model.h index e64284ec8..e23055480 100644 --- a/src/observer/sql/optimizer/cascade/cost_model.h +++ b/src/observer/sql/optimizer/cascade/cost_model.h @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #pragma once - +namespace oceanbase{ class Memo; class GroupExpr; /** @@ -44,4 +44,5 @@ class CostModel inline double io() { return IO; } double calculate_cost(Memo *memo, GroupExpr *gexpr); -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/group.cpp b/src/observer/sql/optimizer/cascade/group.cpp index fab245d1a..7343de8cd 100644 --- a/src/observer/sql/optimizer/cascade/group.cpp +++ b/src/observer/sql/optimizer/cascade/group.cpp @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/group.h" #include "sql/optimizer/cascade/group_expr.h" #include "sql/optimizer/cascade/memo.h" - +namespace oceanbase{ Group::Group(int id, GroupExpr* expr, Memo *memo) : id_(id), winner_(std::make_tuple(numeric_limits::max(), nullptr)), has_explored_(false) { @@ -73,4 +73,5 @@ void Group::dump() const { LOG_TRACE("Group %d has %lu logical expressions and %lu physical expressions", id_, logical_expressions_.size(), physical_expressions_.size(), physical_expressions_.size()); +} } \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/group.h b/src/observer/sql/optimizer/cascade/group.h index bcecf58b1..9b04e0db9 100644 --- a/src/observer/sql/optimizer/cascade/group.h +++ b/src/observer/sql/optimizer/cascade/group.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "common/lang/unordered_map.h" #include "sql/optimizer/cascade/property_set.h" - +namespace oceanbase{ class GroupExpr; class Memo; /** @@ -110,4 +110,5 @@ class Group std::vector physical_expressions_; unique_ptr logical_prop_ = nullptr; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/group_expr.cpp b/src/observer/sql/optimizer/cascade/group_expr.cpp index be0e4aeba..a25b34fcb 100644 --- a/src/observer/sql/optimizer/cascade/group_expr.cpp +++ b/src/observer/sql/optimizer/cascade/group_expr.cpp @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/group_expr.h" - +namespace oceanbase{ uint64_t GroupExpr::hash() const { auto hash = contents_->hash(); @@ -26,4 +26,5 @@ void GroupExpr::dump() const ss << child << " "; } LOG_TRACE("GroupExpr contents: %d child groups: %s", static_cast(contents_->get_op_type()), ss.str().c_str()); +} } \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/group_expr.h b/src/observer/sql/optimizer/cascade/group_expr.h index c3d752dfb..e129e7c94 100644 --- a/src/observer/sql/optimizer/cascade/group_expr.h +++ b/src/observer/sql/optimizer/cascade/group_expr.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/operator_node.h" #include "sql/optimizer/cascade/rules.h" #include "sql/optimizer/cascade/property_set.h" - +namespace oceanbase{ // TODO: rename to m_expr(in columbia)? /* GroupExpr used to represent a particular logical or physical * operator expression. @@ -84,4 +84,5 @@ class GroupExpr std::bitset(RuleType::NUM_RULES)> rule_mask_; double lowest_cost_ = std::numeric_limits::max(); -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/implementation_rules.cpp b/src/observer/sql/optimizer/cascade/implementation_rules.cpp index 740f44381..40db18fbc 100644 --- a/src/observer/sql/optimizer/cascade/implementation_rules.cpp +++ b/src/observer/sql/optimizer/cascade/implementation_rules.cpp @@ -27,7 +27,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/group_by_logical_operator.h" #include "sql/operator/scalar_group_by_physical_operator.h" #include "sql/operator/hash_group_by_physical_operator.h" - +namespace oceanbase{ // ------------------------------------------------------------------------------------------------- // PhysicalSeqScan // ------------------------------------------------------------------------------------------------- @@ -261,4 +261,5 @@ void LogicalPredicateToPredicate::transform(OperatorNode* input, // } // transformed->emplace_back(std::move(groupby_phys_oper)); -// } \ No newline at end of file +// } +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/implementation_rules.h b/src/observer/sql/optimizer/cascade/implementation_rules.h index d82182ce6..53c4e43be 100644 --- a/src/observer/sql/optimizer/cascade/implementation_rules.h +++ b/src/observer/sql/optimizer/cascade/implementation_rules.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/optimizer/cascade/rules.h" - +namespace oceanbase{ /** * Rule transforms Logical Scan -> Physical Scan */ @@ -125,4 +125,5 @@ class LogicalPredicateToPredicate : public Rule // void transform(OperatorNode* input, // std::vector> *transformed, // OptimizerContext *context) const override; -// }; \ No newline at end of file +// }; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/memo.cpp b/src/observer/sql/optimizer/cascade/memo.cpp index 677d34ab6..5d3e0b39c 100644 --- a/src/observer/sql/optimizer/cascade/memo.cpp +++ b/src/observer/sql/optimizer/cascade/memo.cpp @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/memo.h" - +namespace oceanbase{ GroupExpr *Memo::insert_expression(GroupExpr *gexpr, int target_group) { gexpr->set_group_id(target_group); @@ -50,4 +50,5 @@ void Memo::dump() const for (const auto &group : groups_) { group->dump(); } +} } \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/memo.h b/src/observer/sql/optimizer/cascade/memo.h index cef553795..a273047a1 100644 --- a/src/observer/sql/optimizer/cascade/memo.h +++ b/src/observer/sql/optimizer/cascade/memo.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "sql/optimizer/cascade/group_expr.h" #include "sql/optimizer/cascade/group.h" - +namespace oceanbase{ const int UNDEFINED_GROUP = -1; /** @@ -90,4 +90,5 @@ class Memo // 过程中生成的临时物理算子节点的，有些物理算子节点的所有权会转移到外面，有些物理算子的所有权还在memo，需要删除。 用 // shared_ptr 更加合适，但是改动比较大，先暂时不改了。 std::unordered_map> operator_nodes_; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/optimizer.cpp b/src/observer/sql/optimizer/cascade/optimizer.cpp index dd6b26a68..71e091843 100644 --- a/src/observer/sql/optimizer/cascade/optimizer.cpp +++ b/src/observer/sql/optimizer/cascade/optimizer.cpp @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/optimizer.h" #include "sql/optimizer/cascade/tasks/o_group_task.h" #include "sql/optimizer/cascade/memo.h" - +namespace oceanbase{ std::unique_ptr Optimizer::optimize(OperatorNode* op_tree) { // Generate initial operator tree from query tree @@ -70,3 +70,4 @@ void Optimizer::execute_task_stack(PendingTasks *task_stack, int root_group_id, delete task; } } +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/optimizer.h b/src/observer/sql/optimizer/cascade/optimizer.h index 724d4a9de..0be007449 100644 --- a/src/observer/sql/optimizer/cascade/optimizer.h +++ b/src/observer/sql/optimizer/cascade/optimizer.h @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/optimizer_context.h" #include "sql/operator/physical_operator.h" #include "sql/optimizer/cascade/property_set.h" - +namespace oceanbase{ /** * @brief cascade optimizer * TODO: currently, Optimizer is used for CBO optimization. need to unify the optimizer in miniob @@ -35,4 +35,5 @@ class Optimizer CostModel cost_model_; std::unique_ptr context_; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/optimizer_context.cpp b/src/observer/sql/optimizer/cascade/optimizer_context.cpp index 4dce30d85..5275478a6 100644 --- a/src/observer/sql/optimizer/cascade/optimizer_context.cpp +++ b/src/observer/sql/optimizer/cascade/optimizer_context.cpp @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/optimizer_context.h" #include "sql/optimizer/cascade/memo.h" #include "sql/optimizer/cascade/rules.h" - +namespace oceanbase{ OptimizerContext::OptimizerContext() : memo_(new Memo()), rule_set_(new RuleSet()), cost_model_(), task_pool_(nullptr), cost_upper_bound_(std::numeric_limits::max()) {} @@ -67,4 +67,5 @@ GroupExpr *OptimizerContext::make_group_expression(OperatorNode* node) void OptimizerContext::record_operator_node_in_memo(unique_ptr&& node) { memo_->record_operator(std::move(node)); - } \ No newline at end of file + } +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/optimizer_context.h b/src/observer/sql/optimizer/cascade/optimizer_context.h index a77fc8162..c31cf915b 100644 --- a/src/observer/sql/optimizer/cascade/optimizer_context.h +++ b/src/observer/sql/optimizer/cascade/optimizer_context.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/pending_tasks.h" #include "sql/operator/operator_node.h" #include "sql/optimizer/cascade/property_set.h" - +namespace oceanbase{ class Memo; class RuleSet; /** @@ -62,4 +62,5 @@ class OptimizerContext CostModel cost_model_; PendingTasks *task_pool_; double cost_upper_bound_; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/pattern.h b/src/observer/sql/optimizer/cascade/pattern.h index 204bac204..d15c11294 100644 --- a/src/observer/sql/optimizer/cascade/pattern.h +++ b/src/observer/sql/optimizer/cascade/pattern.h @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/operator_node.h" #include "common/lang/vector.h" #include "common/lang/memory.h" - +namespace oceanbase{ class Pattern { public: @@ -32,4 +32,5 @@ class Pattern OpType type_; vector> children_; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/pending_tasks.h b/src/observer/sql/optimizer/cascade/pending_tasks.h index 1e6494d82..528034616 100644 --- a/src/observer/sql/optimizer/cascade/pending_tasks.h +++ b/src/observer/sql/optimizer/cascade/pending_tasks.h @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/stack.h" #include "common/log/log.h" #include "sql/optimizer/cascade/tasks/cascade_task.h" - +namespace oceanbase{ /** * @brief This collection of undone cascade tasks is currently stored as a stack. */ @@ -50,4 +50,5 @@ class PendingTasks * Stack for tracking tasks */ std::stack task_stack_; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/property.h b/src/observer/sql/optimizer/cascade/property.h index 965e034db..f0acf477d 100644 --- a/src/observer/sql/optimizer/cascade/property.h +++ b/src/observer/sql/optimizer/cascade/property.h @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #pragma once - +namespace oceanbase{ class Property {}; @@ -27,4 +27,5 @@ class LogicalProperty private: int card_ = 0; /// cardinality -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/property_set.h b/src/observer/sql/optimizer/cascade/property_set.h index b6808d9fe..7560aec28 100644 --- a/src/observer/sql/optimizer/cascade/property_set.h +++ b/src/observer/sql/optimizer/cascade/property_set.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/optimizer/cascade/property.h" - +namespace oceanbase{ class PropertySet; struct PropSetPtrHash { @@ -40,4 +40,5 @@ class PropertySet private: std::vector properties_; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/rules.cpp b/src/observer/sql/optimizer/cascade/rules.cpp index c78fbf596..70aea4b6b 100644 --- a/src/observer/sql/optimizer/cascade/rules.cpp +++ b/src/observer/sql/optimizer/cascade/rules.cpp @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/rules.h" #include "sql/optimizer/cascade/implementation_rules.h" #include "sql/optimizer/cascade/group_expr.h" - +namespace oceanbase{ RuleSet::RuleSet() { add_rule(RuleSetName::PHYSICAL_IMPLEMENTATION, new LogicalProjectionToProjection()); @@ -21,4 +21,5 @@ RuleSet::RuleSet() add_rule(RuleSetName::PHYSICAL_IMPLEMENTATION, new LogicalCalcToCalc()); add_rule(RuleSetName::PHYSICAL_IMPLEMENTATION, new LogicalDeleteToDelete()); add_rule(RuleSetName::PHYSICAL_IMPLEMENTATION, new LogicalPredicateToPredicate()); +} } \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/rules.h b/src/observer/sql/optimizer/cascade/rules.h index b60547a31..9cc9d93a7 100644 --- a/src/observer/sql/optimizer/cascade/rules.h +++ b/src/observer/sql/optimizer/cascade/rules.h @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/unordered_map.h" #include "sql/optimizer/cascade/optimizer_context.h" #include "sql/optimizer/cascade/pattern.h" - +namespace oceanbase{ /** * @brief: Enum defining the types of rules */ @@ -193,4 +193,5 @@ class RuleSet * TODO: use unique_ptr */ std::unordered_map> rules_map_; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.cpp b/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.cpp index d40c0e570..4a6e17d82 100644 --- a/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.cpp @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/group_expr.h" #include "sql/optimizer/cascade/rules.h" #include "common/log/log.h" - +namespace oceanbase{ void ApplyRule::perform() { LOG_TRACE("ApplyRule::perform() for rule: {%d}", rule_->get_rule_idx()); @@ -51,4 +51,5 @@ void ApplyRule::perform() } group_expr_->set_rule_explored(rule_); +} } \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.h b/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.h index 124bf2974..c86528191 100644 --- a/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.h @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/tasks/cascade_task.h" #include "sql/optimizer/cascade/rules.h" - +namespace oceanbase{ /** * @brief ApplyRule task */ @@ -28,4 +28,5 @@ class ApplyRule : public CascadeTask private: GroupExpr *group_expr_; Rule *rule_; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/cascade_task.cpp b/src/observer/sql/optimizer/cascade/tasks/cascade_task.cpp index aa304930a..7a1a7e6fd 100644 --- a/src/observer/sql/optimizer/cascade/tasks/cascade_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/cascade_task.cpp @@ -13,9 +13,10 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/group_expr.h" #include "sql/optimizer/cascade/rules.h" #include "sql/optimizer/cascade/memo.h" - +namespace oceanbase{ Memo &CascadeTask::get_memo() const {return context_->get_memo(); } RuleSet &CascadeTask::get_rule_set() const { return context_->get_rule_set(); } -void CascadeTask::push_task(CascadeTask *task) { context_->push_task(task); } \ No newline at end of file +void CascadeTask::push_task(CascadeTask *task) { context_->push_task(task); } +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/cascade_task.h b/src/observer/sql/optimizer/cascade/tasks/cascade_task.h index da7987f5b..b27f0b668 100644 --- a/src/observer/sql/optimizer/cascade/tasks/cascade_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/cascade_task.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/lang/vector.h" - +namespace oceanbase{ class Rule; class GroupExpr; class RuleSet; @@ -46,4 +46,5 @@ class CascadeTask protected: CascadeTaskType type_; OptimizerContext *context_; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/e_group_task.cpp b/src/observer/sql/optimizer/cascade/tasks/e_group_task.cpp index 426f2e904..c3c4cf106 100644 --- a/src/observer/sql/optimizer/cascade/tasks/e_group_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/e_group_task.cpp @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/tasks/e_group_task.h" #include "sql/optimizer/cascade/tasks/o_expr_task.h" #include "common/log/log.h" - +namespace oceanbase{ void ExploreGroup::perform() { LOG_TRACE("ExploreGroup::perform() "); @@ -24,4 +24,5 @@ void ExploreGroup::perform() } group_->set_explored(); +} } \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/e_group_task.h b/src/observer/sql/optimizer/cascade/tasks/e_group_task.h index f1534127f..6c33f000a 100644 --- a/src/observer/sql/optimizer/cascade/tasks/e_group_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/e_group_task.h @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/tasks/cascade_task.h" #include "sql/optimizer/cascade/group.h" - +namespace oceanbase{ /** * @brief ExploreGroup */ @@ -27,4 +27,5 @@ class ExploreGroup : public CascadeTask private: Group *group_; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/o_expr_task.cpp b/src/observer/sql/optimizer/cascade/tasks/o_expr_task.cpp index 8e45af9e2..6552b6e24 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_expr_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/o_expr_task.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/memo.h" #include "common/log/log.h" #include - +namespace oceanbase{ void OptimizeExpression::perform() { std::vector valid_rules; @@ -59,3 +59,4 @@ void OptimizeExpression::perform() } } } +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/o_expr_task.h b/src/observer/sql/optimizer/cascade/tasks/o_expr_task.h index afd71029b..dd8211acf 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_expr_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/o_expr_task.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/optimizer/cascade/tasks/cascade_task.h" - +namespace oceanbase{ /** * OptimizeExpression */ @@ -26,4 +26,5 @@ class OptimizeExpression : public CascadeTask private: GroupExpr *group_expr_; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/o_group_task.cpp b/src/observer/sql/optimizer/cascade/tasks/o_group_task.cpp index 47f06bdcc..186a11b07 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_group_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/o_group_task.cpp @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/tasks/o_input_task.h" #include "sql/optimizer/cascade/tasks/o_expr_task.h" #include "sql/optimizer/cascade/optimizer_context.h" - +namespace oceanbase{ void OptimizeGroup::perform() { LOG_TRACE("OptimizeGroup::perform() group %d", group_->get_id()); @@ -35,4 +35,5 @@ void OptimizeGroup::perform() } group_->set_explored(); +} } \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/o_group_task.h b/src/observer/sql/optimizer/cascade/tasks/o_group_task.h index afad210e0..63b2acea2 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_group_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/o_group_task.h @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/tasks/cascade_task.h" #include "sql/optimizer/cascade/group.h" - +namespace oceanbase{ /** * @brief: OptimizeGroup, find the best plan for a group */ @@ -27,4 +27,5 @@ class OptimizeGroup : public CascadeTask private: Group *group_; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/o_input_task.cpp b/src/observer/sql/optimizer/cascade/tasks/o_input_task.cpp index 9ad9b7c7e..8f6f8366c 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_input_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/o_input_task.cpp @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/group_expr.h" #include "sql/optimizer/cascade/memo.h" #include "common/log/log.h" - +namespace oceanbase{ void OptimizeInputs::perform() { LOG_TRACE("OptimizeInputs::perform()"); @@ -50,4 +50,5 @@ void OptimizeInputs::perform() auto cur_group = get_memo().get_group_by_id(group_expr_->get_group_id()); cur_group->set_expr_cost(group_expr_, cur_total_cost_); } +} } \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/o_input_task.h b/src/observer/sql/optimizer/cascade/tasks/o_input_task.h index 0c3100bad..e204f97aa 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_input_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/o_input_task.h @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/tasks/cascade_task.h" #include "sql/optimizer/cascade/property_set.h" - +namespace oceanbase{ /** * OptimizeInputs */ @@ -48,4 +48,5 @@ class OptimizeInputs : public CascadeTask * keep track of the previous optimized input idx */ int prev_child_idx_ = -1; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/comparison_simplification_rule.cpp b/src/observer/sql/optimizer/comparison_simplification_rule.cpp index 99a7655ce..bb4cbfa71 100644 --- a/src/observer/sql/optimizer/comparison_simplification_rule.cpp +++ b/src/observer/sql/optimizer/comparison_simplification_rule.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/comparison_simplification_rule.h" #include "common/log/log.h" #include "sql/expr/expression.h" - +namespace oceanbase{ RC ComparisonSimplificationRule::rewrite(unique_ptr &expr, bool &change_made) { RC rc = RC::SUCCESS; @@ -36,3 +36,4 @@ RC ComparisonSimplificationRule::rewrite(unique_ptr &expr, bool &cha } return rc; } +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/comparison_simplification_rule.h b/src/observer/sql/optimizer/comparison_simplification_rule.h index f46e70d6e..f8f9c6b08 100644 --- a/src/observer/sql/optimizer/comparison_simplification_rule.h +++ b/src/observer/sql/optimizer/comparison_simplification_rule.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/optimizer/rewrite_rule.h" - +namespace oceanbase{ class LogicalOperator; /** @@ -35,3 +35,4 @@ class ComparisonSimplificationRule : public ExpressionRewriteRule private: }; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/conjunction_simplification_rule.cpp b/src/observer/sql/optimizer/conjunction_simplification_rule.cpp index 5ba4e4148..309ad63c4 100644 --- a/src/observer/sql/optimizer/conjunction_simplification_rule.cpp +++ b/src/observer/sql/optimizer/conjunction_simplification_rule.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/conjunction_simplification_rule.h" #include "common/log/log.h" #include "sql/expr/expression.h" - +namespace oceanbase{ RC try_to_get_bool_constant(unique_ptr &expr, bool &constant_value) { if (expr->type() == ExprType::VALUE && expr->value_type() == AttrType::BOOLEANS) { @@ -83,3 +83,4 @@ RC ConjunctionSimplificationRule::rewrite(unique_ptr &expr, bool &ch return rc; } +} diff --git a/src/observer/sql/optimizer/conjunction_simplification_rule.h b/src/observer/sql/optimizer/conjunction_simplification_rule.h index c855f0141..5b017fc21 100644 --- a/src/observer/sql/optimizer/conjunction_simplification_rule.h +++ b/src/observer/sql/optimizer/conjunction_simplification_rule.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/optimizer/rewrite_rule.h" - +namespace oceanbase{ class LogicalOperator; /** @@ -33,3 +33,4 @@ class ConjunctionSimplificationRule : public ExpressionRewriteRule private: }; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/expression_rewriter.cpp b/src/observer/sql/optimizer/expression_rewriter.cpp index b0c6d2455..5c54c48da 100644 --- a/src/observer/sql/optimizer/expression_rewriter.cpp +++ b/src/observer/sql/optimizer/expression_rewriter.cpp @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/conjunction_simplification_rule.h" using namespace std; - +namespace oceanbase{ ExpressionRewriter::ExpressionRewriter() { expr_rewrite_rules_.emplace_back(new ComparisonSimplificationRule); @@ -145,3 +145,4 @@ RC ExpressionRewriter::rewrite_expression(unique_ptr &expr, bool &ch } return rc; } +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/expression_rewriter.h b/src/observer/sql/optimizer/expression_rewriter.h index 3376b1db8..fbaaf8636 100644 --- a/src/observer/sql/optimizer/expression_rewriter.h +++ b/src/observer/sql/optimizer/expression_rewriter.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "sql/operator/logical_operator.h" #include "sql/optimizer/rewrite_rule.h" - +namespace oceanbase{ class ExpressionRewriter : public RewriteRule { public: @@ -34,3 +34,4 @@ class ExpressionRewriter : public RewriteRule private: vector> expr_rewrite_rules_; }; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/logical_plan_generator.cpp b/src/observer/sql/optimizer/logical_plan_generator.cpp index f9da53f3a..8690f59b3 100644 --- a/src/observer/sql/optimizer/logical_plan_generator.cpp +++ b/src/observer/sql/optimizer/logical_plan_generator.cpp @@ -39,7 +39,7 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; - +namespace oceanbase{ RC LogicalPlanGenerator::create(Stmt *stmt, unique_ptr &logical_operator) { RC rc = RC::SUCCESS; @@ -357,3 +357,4 @@ RC LogicalPlanGenerator::create_group_by_plan(SelectStmt *select_stmt, unique_pt logical_operator = std::move(group_by_oper); return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/logical_plan_generator.h b/src/observer/sql/optimizer/logical_plan_generator.h index e0707deff..66aab52c1 100644 --- a/src/observer/sql/optimizer/logical_plan_generator.h +++ b/src/observer/sql/optimizer/logical_plan_generator.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/memory.h" #include "common/sys/rc.h" #include "common/type/attr_type.h" - +namespace oceanbase{ class Stmt; class CalcStmt; class SelectStmt; @@ -47,3 +47,4 @@ class LogicalPlanGenerator int implicit_cast_cost(AttrType from, AttrType to); }; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/optimize_stage.cpp b/src/observer/sql/optimizer/optimize_stage.cpp index a0560541f..53efb7154 100644 --- a/src/observer/sql/optimizer/optimize_stage.cpp +++ b/src/observer/sql/optimizer/optimize_stage.cpp @@ -29,7 +29,7 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; - +namespace oceanbase{ RC OptimizeStage::handle_request(SQLStageEvent *sql_event) { unique_ptr logical_operator; @@ -130,3 +130,4 @@ RC OptimizeStage::create_logical_plan(SQLStageEvent *sql_event, unique_ptr& children) { std::function &)> to_string = [&]( @@ -61,4 +61,5 @@ string OptimizerUtils::dump_physical_plan(const unique_ptr& ch to_string(ss, children.get(), level, true /*last_child*/, ends); return ss.str(); +} } \ No newline at end of file diff --git a/src/observer/sql/optimizer/optimizer_utils.h b/src/observer/sql/optimizer/optimizer_utils.h index 6cb2c6529..5cb481f67 100644 --- a/src/observer/sql/optimizer/optimizer_utils.h +++ b/src/observer/sql/optimizer/optimizer_utils.h @@ -13,9 +13,10 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "common/lang/memory.h" #include "sql/operator/physical_operator.h" - +namespace oceanbase{ class OptimizerUtils { public: static string dump_physical_plan(const unique_ptr &root); -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/physical_plan_generator.cpp b/src/observer/sql/optimizer/physical_plan_generator.cpp index 4ce64a24b..3848ce5ba 100644 --- a/src/observer/sql/optimizer/physical_plan_generator.cpp +++ b/src/observer/sql/optimizer/physical_plan_generator.cpp @@ -45,7 +45,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/physical_plan_generator.h" using namespace std; - +namespace oceanbase{ RC PhysicalPlanGenerator::create(LogicalOperator &logical_operator, unique_ptr &oper, Session* session) { RC rc = RC::SUCCESS; @@ -469,3 +469,4 @@ RC PhysicalPlanGenerator::create_vec_plan(ExplainLogicalOperator &explain_oper, oper = std::move(explain_physical_oper); return rc; } +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/physical_plan_generator.h b/src/observer/sql/optimizer/physical_plan_generator.h index 85f2e27d2..146154869 100644 --- a/src/observer/sql/optimizer/physical_plan_generator.h +++ b/src/observer/sql/optimizer/physical_plan_generator.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/operator/logical_operator.h" #include "sql/operator/physical_operator.h" - +namespace oceanbase{ class Session; class TableGetLogicalOperator; class PredicateLogicalOperator; @@ -62,3 +62,4 @@ class PhysicalPlanGenerator // TODO: remove this and add CBO rules bool can_use_hash_join(JoinLogicalOperator &logical_oper); }; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/predicate_pushdown_rewriter.cpp b/src/observer/sql/optimizer/predicate_pushdown_rewriter.cpp index f67cc551d..5f83a826d 100644 --- a/src/observer/sql/optimizer/predicate_pushdown_rewriter.cpp +++ b/src/observer/sql/optimizer/predicate_pushdown_rewriter.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "sql/operator/logical_operator.h" #include "sql/operator/table_get_logical_operator.h" - +namespace oceanbase{ RC PredicatePushdownRewriter::rewrite(unique_ptr &oper, bool &change_made) { RC rc = RC::SUCCESS; @@ -124,3 +124,4 @@ RC PredicatePushdownRewriter::get_exprs_can_pushdown( } return rc; } +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/predicate_pushdown_rewriter.h b/src/observer/sql/optimizer/predicate_pushdown_rewriter.h index 5fbc4510a..b4a6e0535 100644 --- a/src/observer/sql/optimizer/predicate_pushdown_rewriter.h +++ b/src/observer/sql/optimizer/predicate_pushdown_rewriter.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/vector.h" #include "sql/optimizer/rewrite_rule.h" - +namespace oceanbase{ /** * @brief 将一些谓词表达式下推到表数据扫描中 * @ingroup Rewriter @@ -34,3 +34,4 @@ class PredicatePushdownRewriter : public RewriteRule RC get_exprs_can_pushdown(unique_ptr &expr, vector> &pushdown_exprs); bool is_empty_predicate(unique_ptr &expr); }; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/predicate_rewrite.cpp b/src/observer/sql/optimizer/predicate_rewrite.cpp index 7444efd68..6b4bc1abd 100644 --- a/src/observer/sql/optimizer/predicate_rewrite.cpp +++ b/src/observer/sql/optimizer/predicate_rewrite.cpp @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/predicate_rewrite.h" #include "sql/operator/logical_operator.h" - +namespace oceanbase{ RC PredicateRewriteRule::rewrite(unique_ptr &oper, bool &change_made) { vector> &child_opers = oper->children(); @@ -56,3 +56,4 @@ RC PredicateRewriteRule::rewrite(unique_ptr &oper, bool &change change_made = true; return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/predicate_rewrite.h b/src/observer/sql/optimizer/predicate_rewrite.h index 193742dfa..269dd7e44 100644 --- a/src/observer/sql/optimizer/predicate_rewrite.h +++ b/src/observer/sql/optimizer/predicate_rewrite.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/optimizer/rewrite_rule.h" - +namespace oceanbase{ /** * @brief 谓词重写规则 * @ingroup Rewriter @@ -29,3 +29,4 @@ class PredicateRewriteRule : public RewriteRule RC rewrite(unique_ptr &oper, bool &change_made) override; }; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/predicate_to_join_rule.h b/src/observer/sql/optimizer/predicate_to_join_rule.h index 4a91f3eb9..da47d5f52 100644 --- a/src/observer/sql/optimizer/predicate_to_join_rule.h +++ b/src/observer/sql/optimizer/predicate_to_join_rule.h @@ -12,10 +12,11 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/vector.h" #include "sql/optimizer/rewrite_rule.h" - +namespace oceanbase{ /** * @brief 将一些谓词表达式下推到join中 * @ingroup Rewriter */ class PredicateToJoinRewriter {}; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/rewrite_rule.h b/src/observer/sql/optimizer/rewrite_rule.h index 894273d4a..d2d004608 100644 --- a/src/observer/sql/optimizer/rewrite_rule.h +++ b/src/observer/sql/optimizer/rewrite_rule.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "common/lang/memory.h" - +namespace oceanbase{ class LogicalOperator; class Expression; @@ -44,3 +44,4 @@ class ExpressionRewriteRule virtual RC rewrite(unique_ptr &expr, bool &change_made) = 0; }; +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/rewriter.cpp b/src/observer/sql/optimizer/rewriter.cpp index fcb189b1b..b752611ce 100644 --- a/src/observer/sql/optimizer/rewriter.cpp +++ b/src/observer/sql/optimizer/rewriter.cpp @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/expression_rewriter.h" #include "sql/optimizer/predicate_pushdown_rewriter.h" #include "sql/optimizer/predicate_rewrite.h" - +namespace oceanbase{ Rewriter::Rewriter() { rewrite_rules_.emplace_back(new ExpressionRewriter); @@ -64,3 +64,4 @@ RC Rewriter::rewrite(unique_ptr &oper, bool &change_made) } return rc; } +} \ No newline at end of file diff --git a/src/observer/sql/optimizer/rewriter.h b/src/observer/sql/optimizer/rewriter.h index b54fc71f6..2a5644421 100644 --- a/src/observer/sql/optimizer/rewriter.h +++ b/src/observer/sql/optimizer/rewriter.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/rewrite_rule.h" #include "common/lang/memory.h" #include "common/lang/vector.h" - +namespace oceanbase{ class LogicalOperator; /** @@ -50,3 +50,4 @@ class Rewriter private: vector> rewrite_rules_; }; +} diff --git a/src/observer/sql/optimizer/statistics/table_statistics.h b/src/observer/sql/optimizer/statistics/table_statistics.h index c1e75e7a6..d1e27e95d 100644 --- a/src/observer/sql/optimizer/statistics/table_statistics.h +++ b/src/observer/sql/optimizer/statistics/table_statistics.h @@ -9,6 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #pragma once - +namespace oceanbase{ class TableStatistics -{}; \ No newline at end of file +{}; +} \ No newline at end of file diff --git a/src/observer/sql/parser/expression_binder.cpp b/src/observer/sql/parser/expression_binder.cpp index 684ecf468..46bd74ba0 100644 --- a/src/observer/sql/parser/expression_binder.cpp +++ b/src/observer/sql/parser/expression_binder.cpp @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression_iterator.h" using namespace common; - +namespace oceanbase{ Table *BinderContext::find_table(const char *table_name) const { auto pred = [table_name](Table *table) { return 0 == strcasecmp(table_name, table->name()); }; @@ -447,3 +447,4 @@ RC ExpressionBinder::bind_aggregate_expression( bound_expressions.emplace_back(std::move(aggregate_expr)); return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/sql/parser/expression_binder.h b/src/observer/sql/parser/expression_binder.h index 9a5e7c9cd..ed9572e63 100644 --- a/src/observer/sql/parser/expression_binder.h +++ b/src/observer/sql/parser/expression_binder.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/expr/expression.h" - +namespace oceanbase{ class BinderContext { public: @@ -63,3 +63,4 @@ class ExpressionBinder private: BinderContext &context_; }; +} \ No newline at end of file diff --git a/src/observer/sql/parser/parse.cpp b/src/observer/sql/parser/parse.cpp index 5762452be..d69b72eed 100644 --- a/src/observer/sql/parser/parse.cpp +++ b/src/observer/sql/parser/parse.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse.h" #include "common/log/log.h" #include "sql/expr/expression.h" - +namespace oceanbase{ RC parse(char *st, ParsedSqlNode *sqln); ParsedSqlNode::ParsedSqlNode() : flag(SCF_ERROR) {} @@ -36,3 +36,4 @@ RC parse(const char *st, ParsedSqlResult *sql_result) sql_parse(st, sql_result); return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/sql/parser/parse.h b/src/observer/sql/parser/parse.h index 5aaeda3f7..5ef636425 100644 --- a/src/observer/sql/parser/parse.h +++ b/src/observer/sql/parser/parse.h @@ -16,5 +16,6 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/parser/parse_defs.h" - +namespace oceanbase{ RC parse(const char *st, ParsedSqlResult *sql_result); +} \ No newline at end of file diff --git a/src/observer/sql/parser/parse_defs.h b/src/observer/sql/parser/parse_defs.h index 7d9ab7e5a..009285b43 100644 --- a/src/observer/sql/parser/parse_defs.h +++ b/src/observer/sql/parser/parse_defs.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/memory.h" #include "common/value.h" #include "common/lang/utility.h" - +namespace oceanbase{ class Expression; /** @@ -337,3 +337,4 @@ class ParsedSqlResult private: vector> sql_nodes_; ///< 这里记录SQL命令。虽然看起来支持多个，但是当前仅处理一个 }; +} \ No newline at end of file diff --git a/src/observer/sql/parser/parse_stage.cpp b/src/observer/sql/parser/parse_stage.cpp index ec92cb46a..c6757ce5d 100644 --- a/src/observer/sql/parser/parse_stage.cpp +++ b/src/observer/sql/parser/parse_stage.cpp @@ -25,7 +25,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse.h" using namespace common; - +namespace oceanbase{ RC ParseStage::handle_request(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; @@ -59,3 +59,4 @@ RC ParseStage::handle_request(SQLStageEvent *sql_event) return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/sql/parser/parse_stage.h b/src/observer/sql/parser/parse_stage.h index 6d0706949..517f2a2e3 100644 --- a/src/observer/sql/parser/parse_stage.h +++ b/src/observer/sql/parser/parse_stage.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" - +namespace oceanbase{ class SQLStageEvent; /** @@ -27,3 +27,4 @@ class ParseStage public: RC handle_request(SQLStageEvent *sql_event); }; +} \ No newline at end of file diff --git a/src/observer/sql/parser/resolve_stage.cpp b/src/observer/sql/parser/resolve_stage.cpp index 810617058..de215c302 100644 --- a/src/observer/sql/parser/resolve_stage.cpp +++ b/src/observer/sql/parser/resolve_stage.cpp @@ -26,7 +26,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/stmt.h" using namespace common; - +namespace oceanbase{ RC ResolveStage::handle_request(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; @@ -56,3 +56,4 @@ RC ResolveStage::handle_request(SQLStageEvent *sql_event) return rc; } +} \ No newline at end of file diff --git a/src/observer/sql/parser/resolve_stage.h b/src/observer/sql/parser/resolve_stage.h index a049b7951..bc33babc2 100644 --- a/src/observer/sql/parser/resolve_stage.h +++ b/src/observer/sql/parser/resolve_stage.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" - +namespace oceanbase{ class SQLStageEvent; /** @@ -27,3 +27,4 @@ class ResolveStage public: RC handle_request(SQLStageEvent *sql_event); }; +} \ No newline at end of file diff --git a/src/observer/sql/plan_cache/plan_cache_stage.h b/src/observer/sql/plan_cache/plan_cache_stage.h index e4ea51fca..7a0bc0275 100644 --- a/src/observer/sql/plan_cache/plan_cache_stage.h +++ b/src/observer/sql/plan_cache/plan_cache_stage.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" - +namespace oceanbase{ /** * @brief 尝试从Plan的缓存中获取Plan，如果没有命中，则执行Optimizer * @ingroup SQLStage @@ -24,3 +24,4 @@ See the Mulan PSL v2 for more details. */ */ class PlanCacheStage {}; +} \ No newline at end of file diff --git a/src/observer/sql/query_cache/query_cache_stage.cpp b/src/observer/sql/query_cache/query_cache_stage.cpp index ef6ab09f8..9f342c2e0 100644 --- a/src/observer/sql/query_cache/query_cache_stage.cpp +++ b/src/observer/sql/query_cache/query_cache_stage.cpp @@ -22,8 +22,9 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" using namespace common; - +namespace oceanbase{ RC QueryCacheStage::handle_request(SQLStageEvent *sql_event) { return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/sql/query_cache/query_cache_stage.h b/src/observer/sql/query_cache/query_cache_stage.h index 2ffa3979c..196f03c14 100644 --- a/src/observer/sql/query_cache/query_cache_stage.h +++ b/src/observer/sql/query_cache/query_cache_stage.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" - +namespace oceanbase{ class SQLStageEvent; /** @@ -32,3 +32,4 @@ class QueryCacheStage public: RC handle_request(SQLStageEvent *sql_event); }; +} \ No newline at end of file diff --git a/src/observer/sql/stmt/analyze_table_stmt.cpp b/src/observer/sql/stmt/analyze_table_stmt.cpp index 9cb029e57..6f4c1eb3f 100644 --- a/src/observer/sql/stmt/analyze_table_stmt.cpp +++ b/src/observer/sql/stmt/analyze_table_stmt.cpp @@ -10,7 +10,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/analyze_table_stmt.h" #include "storage/db/db.h" - +namespace oceanbase{ RC AnalyzeTableStmt::create(Db *db, const AnalyzeTableSqlNode &analyze_table, Stmt *&stmt) { if (db->find_table(analyze_table.relation_name.c_str()) == nullptr) { @@ -19,3 +19,4 @@ RC AnalyzeTableStmt::create(Db *db, const AnalyzeTableSqlNode &analyze_table, St stmt = new AnalyzeTableStmt(analyze_table.relation_name); return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/sql/stmt/analyze_table_stmt.h b/src/observer/sql/stmt/analyze_table_stmt.h index 7730e5c04..c03fec730 100644 --- a/src/observer/sql/stmt/analyze_table_stmt.h +++ b/src/observer/sql/stmt/analyze_table_stmt.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/stmt/stmt.h" - +namespace oceanbase{ class Db; /** @@ -33,3 +33,4 @@ class AnalyzeTableStmt : public Stmt private: string table_name_; }; +} \ No newline at end of file diff --git a/src/observer/sql/stmt/calc_stmt.h b/src/observer/sql/stmt/calc_stmt.h index 4b5fcdf54..fbbe53ad1 100644 --- a/src/observer/sql/stmt/calc_stmt.h +++ b/src/observer/sql/stmt/calc_stmt.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/expr/expression.h" #include "sql/stmt/stmt.h" - +namespace oceanbase{ class Db; class Table; @@ -48,3 +48,4 @@ class CalcStmt : public Stmt private: vector> expressions_; }; +} \ No newline at end of file diff --git a/src/observer/sql/stmt/create_index_stmt.cpp b/src/observer/sql/stmt/create_index_stmt.cpp index 93fae6630..30efa69f5 100644 --- a/src/observer/sql/stmt/create_index_stmt.cpp +++ b/src/observer/sql/stmt/create_index_stmt.cpp @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; - +namespace oceanbase{ RC CreateIndexStmt::create(Db *db, const CreateIndexSqlNode &create_index, Stmt *&stmt) { stmt = nullptr; @@ -56,3 +56,4 @@ RC CreateIndexStmt::create(Db *db, const CreateIndexSqlNode &create_index, Stmt stmt = new CreateIndexStmt(table, field_meta, create_index.index_name); return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/sql/stmt/create_index_stmt.h b/src/observer/sql/stmt/create_index_stmt.h index cbdd8f4d1..aa385420c 100644 --- a/src/observer/sql/stmt/create_index_stmt.h +++ b/src/observer/sql/stmt/create_index_stmt.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/stmt/stmt.h" - +namespace oceanbase{ struct CreateIndexSqlNode; class Table; class FieldMeta; @@ -47,3 +47,4 @@ class CreateIndexStmt : public Stmt const FieldMeta *field_meta_ = nullptr; string index_name_; }; +} \ No newline at end of file diff --git a/src/observer/sql/stmt/create_table_stmt.cpp b/src/observer/sql/stmt/create_table_stmt.cpp index d8a8944c5..295239fe9 100644 --- a/src/observer/sql/stmt/create_table_stmt.cpp +++ b/src/observer/sql/stmt/create_table_stmt.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/types.h" #include "sql/stmt/create_table_stmt.h" #include "event/sql_debug.h" - +namespace oceanbase{ RC CreateTableStmt::create(Db *db, const CreateTableSqlNode &create_table, Stmt *&stmt) { StorageFormat storage_format = get_storage_format(create_table.storage_format.c_str()); @@ -41,3 +41,4 @@ StorageFormat CreateTableStmt::get_storage_format(const char *format_str) { } return format; } +} \ No newline at end of file diff --git a/src/observer/sql/stmt/create_table_stmt.h b/src/observer/sql/stmt/create_table_stmt.h index 3dd7b17b0..4e1df5a25 100644 --- a/src/observer/sql/stmt/create_table_stmt.h +++ b/src/observer/sql/stmt/create_table_stmt.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "common/lang/vector.h" #include "sql/stmt/stmt.h" - +namespace oceanbase{ class Db; /** @@ -50,3 +50,4 @@ class CreateTableStmt : public Stmt vector primary_keys_; StorageFormat storage_format_; }; +} \ No newline at end of file diff --git a/src/observer/sql/stmt/delete_stmt.cpp b/src/observer/sql/stmt/delete_stmt.cpp index 89dce0db8..a3689eba5 100644 --- a/src/observer/sql/stmt/delete_stmt.cpp +++ b/src/observer/sql/stmt/delete_stmt.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/filter_stmt.h" #include "storage/db/db.h" #include "storage/table/table.h" - +namespace oceanbase{ DeleteStmt::DeleteStmt(Table *table, FilterStmt *filter_stmt) : table_(table), filter_stmt_(filter_stmt) {} DeleteStmt::~DeleteStmt() @@ -57,3 +57,4 @@ RC DeleteStmt::create(Db *db, const DeleteSqlNode &delete_sql, Stmt *&stmt) stmt = new DeleteStmt(table, filter_stmt); return rc; } +} \ No newline at end of file diff --git a/src/observer/sql/stmt/delete_stmt.h b/src/observer/sql/stmt/delete_stmt.h index 33cda12a6..740827bba 100644 --- a/src/observer/sql/stmt/delete_stmt.h +++ b/src/observer/sql/stmt/delete_stmt.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse_defs.h" #include "sql/stmt/stmt.h" - +namespace oceanbase{ class Table; class FilterStmt; @@ -42,3 +42,4 @@ class DeleteStmt : public Stmt Table *table_ = nullptr; FilterStmt *filter_stmt_ = nullptr; }; +} \ No newline at end of file diff --git a/src/observer/sql/stmt/desc_table_stmt.cpp b/src/observer/sql/stmt/desc_table_stmt.cpp index 1f1e65a13..12c88fa7a 100644 --- a/src/observer/sql/stmt/desc_table_stmt.cpp +++ b/src/observer/sql/stmt/desc_table_stmt.cpp @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/desc_table_stmt.h" #include "storage/db/db.h" - +namespace oceanbase{ RC DescTableStmt::create(Db *db, const DescTableSqlNode &desc_table, Stmt *&stmt) { if (db->find_table(desc_table.relation_name.c_str()) == nullptr) { @@ -23,3 +23,4 @@ RC DescTableStmt::create(Db *db, const DescTableSqlNode &desc_table, Stmt *&stmt stmt = new DescTableStmt(desc_table.relation_name); return RC::SUCCESS; } +} diff --git a/src/observer/sql/stmt/desc_table_stmt.h b/src/observer/sql/stmt/desc_table_stmt.h index 9e57a8a67..cffdc7c72 100644 --- a/src/observer/sql/stmt/desc_table_stmt.h +++ b/src/observer/sql/stmt/desc_table_stmt.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/stmt/stmt.h" - +namespace oceanbase{ class Db; /** @@ -38,3 +38,4 @@ class DescTableStmt : public Stmt private: string table_name_; }; +} diff --git a/src/observer/sql/stmt/exit_stmt.h b/src/observer/sql/stmt/exit_stmt.h index 228223bd6..a3501b4f6 100644 --- a/src/observer/sql/stmt/exit_stmt.h +++ b/src/observer/sql/stmt/exit_stmt.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/stmt/stmt.h" - +namespace oceanbase{ /** * @brief Exit 语句，表示断开连接，现在什么成员都没有 * @ingroup Statement @@ -33,4 +33,5 @@ class ExitStmt : public Stmt stmt = new ExitStmt(); return RC::SUCCESS; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/stmt/explain_stmt.cpp b/src/observer/sql/stmt/explain_stmt.cpp index 7efea6a2b..054a00983 100644 --- a/src/observer/sql/stmt/explain_stmt.cpp +++ b/src/observer/sql/stmt/explain_stmt.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/explain_stmt.h" #include "common/log/log.h" #include "sql/stmt/stmt.h" - +namespace oceanbase{ ExplainStmt::ExplainStmt(unique_ptr child_stmt) : child_stmt_(std::move(child_stmt)) {} RC ExplainStmt::create(Db *db, const ExplainSqlNode &explain, Stmt *&stmt) @@ -31,3 +31,4 @@ RC ExplainStmt::create(Db *db, const ExplainSqlNode &explain, Stmt *&stmt) stmt = new ExplainStmt(std::move(child_stmt_ptr)); return rc; } +} \ No newline at end of file diff --git a/src/observer/sql/stmt/explain_stmt.h b/src/observer/sql/stmt/explain_stmt.h index 3634f07cd..befbf3e24 100644 --- a/src/observer/sql/stmt/explain_stmt.h +++ b/src/observer/sql/stmt/explain_stmt.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/stmt/stmt.h" - +namespace oceanbase{ /** * @brief explain语句 * @ingroup Statement @@ -35,3 +35,4 @@ class ExplainStmt : public Stmt private: unique_ptr child_stmt_; }; +} \ No newline at end of file diff --git a/src/observer/sql/stmt/filter_stmt.cpp b/src/observer/sql/stmt/filter_stmt.cpp index aa078bcbb..d267fa495 100644 --- a/src/observer/sql/stmt/filter_stmt.cpp +++ b/src/observer/sql/stmt/filter_stmt.cpp @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "storage/db/db.h" #include "storage/table/table.h" - +namespace oceanbase{ FilterStmt::~FilterStmt() { for (FilterUnit *unit : filter_units_) { @@ -130,3 +130,4 @@ RC FilterStmt::create_filter_unit(Db *db, Table *default_table, unordered_map filter_units_; // 默认当前都是AND关系 }; +} \ No newline at end of file diff --git a/src/observer/sql/stmt/help_stmt.h b/src/observer/sql/stmt/help_stmt.h index 1946b56cb..f091ab40f 100644 --- a/src/observer/sql/stmt/help_stmt.h +++ b/src/observer/sql/stmt/help_stmt.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include #include "sql/stmt/stmt.h" - +namespace oceanbase{ /** * @brief Help 语句，现在什么成员都没有 * @ingroup Statement @@ -36,4 +36,5 @@ class HelpStmt : public Stmt stmt = new HelpStmt(); return RC::SUCCESS; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/stmt/insert_stmt.cpp b/src/observer/sql/stmt/insert_stmt.cpp index 96ced424f..c4e56e575 100644 --- a/src/observer/sql/stmt/insert_stmt.cpp +++ b/src/observer/sql/stmt/insert_stmt.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "storage/db/db.h" #include "storage/table/table.h" - +namespace oceanbase{ InsertStmt::InsertStmt(Table *table, const Value *values, int value_amount) : table_(table), values_(values), value_amount_(value_amount) {} @@ -51,3 +51,4 @@ RC InsertStmt::create(Db *db, const InsertSqlNode &inserts, Stmt *&stmt) stmt = new InsertStmt(table, values, value_num); return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/sql/stmt/insert_stmt.h b/src/observer/sql/stmt/insert_stmt.h index 51c162ac8..fc1dd2e46 100644 --- a/src/observer/sql/stmt/insert_stmt.h +++ b/src/observer/sql/stmt/insert_stmt.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/stmt/stmt.h" - +namespace oceanbase{ class Table; class Db; @@ -45,3 +45,4 @@ class InsertStmt : public Stmt const Value *values_ = nullptr; int value_amount_ = 0; }; +} \ No newline at end of file diff --git a/src/observer/sql/stmt/load_data_stmt.cpp b/src/observer/sql/stmt/load_data_stmt.cpp index 37335dfa7..f14056f2d 100644 --- a/src/observer/sql/stmt/load_data_stmt.cpp +++ b/src/observer/sql/stmt/load_data_stmt.cpp @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include using namespace common; - +namespace oceanbase{ RC LoadDataStmt::create(Db *db, const LoadDataSqlNode &load_data, Stmt *&stmt) { RC rc = RC::SUCCESS; @@ -55,3 +55,4 @@ RC LoadDataStmt::create(Db *db, const LoadDataSqlNode &load_data, Stmt *&stmt) stmt = new LoadDataStmt(table, load_data.file_name.c_str(), load_data.terminated[1], load_data.enclosed[1]); return rc; } +} \ No newline at end of file diff --git a/src/observer/sql/stmt/load_data_stmt.h b/src/observer/sql/stmt/load_data_stmt.h index 5e5c49b67..4b5e9b921 100644 --- a/src/observer/sql/stmt/load_data_stmt.h +++ b/src/observer/sql/stmt/load_data_stmt.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/stmt/stmt.h" - +namespace oceanbase{ class Table; class LoadDataStmt : public Stmt @@ -41,3 +41,4 @@ class LoadDataStmt : public Stmt char terminated_; char enclosed_; }; +} \ No newline at end of file diff --git a/src/observer/sql/stmt/select_stmt.cpp b/src/observer/sql/stmt/select_stmt.cpp index a51d9e794..9b9bf83fc 100644 --- a/src/observer/sql/stmt/select_stmt.cpp +++ b/src/observer/sql/stmt/select_stmt.cpp @@ -22,7 +22,7 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; - +namespace oceanbase{ SelectStmt::~SelectStmt() { if (nullptr != filter_stmt_) { @@ -110,3 +110,4 @@ RC SelectStmt::create(Db *db, SelectSqlNode &select_sql, Stmt *&stmt) stmt = select_stmt; return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/sql/stmt/select_stmt.h b/src/observer/sql/stmt/select_stmt.h index 5a736d9d0..8b428f87c 100644 --- a/src/observer/sql/stmt/select_stmt.h +++ b/src/observer/sql/stmt/select_stmt.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/stmt/stmt.h" #include "storage/field/field.h" - +namespace oceanbase{ class FieldMeta; class FilterStmt; class Db; @@ -51,3 +51,4 @@ class SelectStmt : public Stmt FilterStmt *filter_stmt_ = nullptr; vector> group_by_; }; +} \ No newline at end of file diff --git a/src/observer/sql/stmt/set_variable_stmt.h b/src/observer/sql/stmt/set_variable_stmt.h index 93eb82aaa..abbda7909 100644 --- a/src/observer/sql/stmt/set_variable_stmt.h +++ b/src/observer/sql/stmt/set_variable_stmt.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include #include "sql/stmt/stmt.h" - +namespace oceanbase{ /** * @brief SetVairable 语句，设置变量，当前是会话变量，但是只有会话变量，没有全局变量 * @ingroup Statement @@ -43,4 +43,5 @@ class SetVariableStmt : public Stmt private: SetVariableSqlNode set_variable_; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/stmt/show_tables_stmt.h b/src/observer/sql/stmt/show_tables_stmt.h index 601a1d568..241d29935 100644 --- a/src/observer/sql/stmt/show_tables_stmt.h +++ b/src/observer/sql/stmt/show_tables_stmt.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include #include "sql/stmt/stmt.h" - +namespace oceanbase{ class Db; /** @@ -39,4 +39,5 @@ class ShowTablesStmt : public Stmt stmt = new ShowTablesStmt(); return RC::SUCCESS; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/stmt/stmt.cpp b/src/observer/sql/stmt/stmt.cpp index 2664aaf60..26b1245cc 100644 --- a/src/observer/sql/stmt/stmt.cpp +++ b/src/observer/sql/stmt/stmt.cpp @@ -30,7 +30,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/show_tables_stmt.h" #include "sql/stmt/trx_begin_stmt.h" #include "sql/stmt/trx_end_stmt.h" - +namespace oceanbase{ bool stmt_type_ddl(StmtType type) { switch (type) { @@ -119,3 +119,4 @@ RC Stmt::create_stmt(Db *db, ParsedSqlNode &sql_node, Stmt *&stmt) } return RC::UNIMPLEMENTED; } +} \ No newline at end of file diff --git a/src/observer/sql/stmt/stmt.h b/src/observer/sql/stmt/stmt.h index 4c9b4b03e..526c190c3 100644 --- a/src/observer/sql/stmt/stmt.h +++ b/src/observer/sql/stmt/stmt.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/parser/parse_defs.h" - +namespace oceanbase{ class Db; /** @@ -92,3 +92,4 @@ class Stmt private: }; +} \ No newline at end of file diff --git a/src/observer/sql/stmt/trx_begin_stmt.h b/src/observer/sql/stmt/trx_begin_stmt.h index afdfaf104..c5a27e99f 100644 --- a/src/observer/sql/stmt/trx_begin_stmt.h +++ b/src/observer/sql/stmt/trx_begin_stmt.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include #include "sql/stmt/stmt.h" - +namespace oceanbase{ /** * @brief 事务的Begin 语句，现在什么成员都没有 * @ingroup Statement @@ -36,4 +36,5 @@ class TrxBeginStmt : public Stmt stmt = new TrxBeginStmt(); return RC::SUCCESS; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/stmt/trx_end_stmt.h b/src/observer/sql/stmt/trx_end_stmt.h index 30454ecf6..9f7000f34 100644 --- a/src/observer/sql/stmt/trx_end_stmt.h +++ b/src/observer/sql/stmt/trx_end_stmt.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include #include "sql/stmt/stmt.h" - +namespace oceanbase{ /** * @brief 事务的 Commit/Rollback 语句，现在什么成员都没有 * @ingroup Statement @@ -40,4 +40,5 @@ class TrxEndStmt : public Stmt private: StmtType type_; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/sql/stmt/update_stmt.cpp b/src/observer/sql/stmt/update_stmt.cpp index 92df6a6dc..93846c350 100644 --- a/src/observer/sql/stmt/update_stmt.cpp +++ b/src/observer/sql/stmt/update_stmt.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // #include "sql/stmt/update_stmt.h" - +namespace oceanbase{ UpdateStmt::UpdateStmt(Table *table, Value *values, int value_amount) : table_(table), values_(values), value_amount_(value_amount) {} @@ -24,3 +24,4 @@ RC UpdateStmt::create(Db *db, const UpdateSqlNode &update, Stmt *&stmt) stmt = nullptr; return RC::INTERNAL; } +} \ No newline at end of file diff --git a/src/observer/sql/stmt/update_stmt.h b/src/observer/sql/stmt/update_stmt.h index 28e13268e..bc5b51752 100644 --- a/src/observer/sql/stmt/update_stmt.h +++ b/src/observer/sql/stmt/update_stmt.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/stmt/stmt.h" - +namespace oceanbase{ class Table; /** @@ -42,3 +42,4 @@ class UpdateStmt : public Stmt Value *values_ = nullptr; int value_amount_ = 0; }; +} \ No newline at end of file diff --git a/src/observer/storage/buffer/buffer_pool_log.cpp b/src/observer/storage/buffer/buffer_pool_log.cpp index b0fb2c961..fc0d3a06f 100644 --- a/src/observer/storage/buffer/buffer_pool_log.cpp +++ b/src/observer/storage/buffer/buffer_pool_log.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/buffer/disk_buffer_pool.h" #include "storage/clog/log_handler.h" #include "storage/clog/log_entry.h" - +namespace oceanbase{ string BufferPoolLogEntry::to_string() const { return string("buffer_pool_id=") + std::to_string(buffer_pool_id) + @@ -94,3 +94,4 @@ RC BufferPoolLogReplayer::replay(const LogEntry &entry) } return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/storage/buffer/buffer_pool_log.h b/src/observer/storage/buffer/buffer_pool_log.h index 604c01971..13a4750de 100644 --- a/src/observer/storage/buffer/buffer_pool_log.h +++ b/src/observer/storage/buffer/buffer_pool_log.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "common/types.h" #include "common/sys/rc.h" #include "storage/clog/log_replayer.h" - +namespace oceanbase{ class DiskBufferPool; class BufferPoolManager; class LogHandler; @@ -127,3 +127,4 @@ class BufferPoolLogReplayer final : public LogReplayer private: BufferPoolManager &bp_manager_; }; +} \ No newline at end of file diff --git a/src/observer/storage/buffer/disk_buffer_pool.cpp b/src/observer/storage/buffer/disk_buffer_pool.cpp index df656d76c..7d1d4f0b3 100644 --- a/src/observer/storage/buffer/disk_buffer_pool.cpp +++ b/src/observer/storage/buffer/disk_buffer_pool.cpp @@ -24,7 +24,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/db/db.h" using namespace common; - +namespace oceanbase{ static const int MEM_POOL_ITEM_NUM = 20; //////////////////////////////////////////////////////////////////////////////// @@ -921,3 +921,4 @@ RC BufferPoolManager::get_buffer_pool(int32_t id, DiskBufferPool *&bp) return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/storage/buffer/disk_buffer_pool.h b/src/observer/storage/buffer/disk_buffer_pool.h index d41d1bd0c..bbe81529f 100644 --- a/src/observer/storage/buffer/disk_buffer_pool.h +++ b/src/observer/storage/buffer/disk_buffer_pool.h @@ -36,7 +36,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/buffer/frame.h" #include "storage/buffer/page.h" #include "storage/buffer/buffer_pool_log.h" - +namespace oceanbase{ class BufferPoolManager; class DiskBufferPool; class DoubleWriteBuffer; @@ -354,3 +354,4 @@ class BufferPoolManager final unordered_map id_to_buffer_pools_; atomic next_buffer_pool_id_{1}; // 系统启动时，会打开所有的表，这样就可以知道当前系统最大的ID是多少了 }; +} \ No newline at end of file diff --git a/src/observer/storage/buffer/double_write_buffer.cpp b/src/observer/storage/buffer/double_write_buffer.cpp index 9cfae43cb..17eda89f2 100644 --- a/src/observer/storage/buffer/double_write_buffer.cpp +++ b/src/observer/storage/buffer/double_write_buffer.cpp @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include using namespace common; - +namespace oceanbase{ struct DoubleWritePage { public: @@ -300,3 +300,4 @@ RC VacuousDoubleWriteBuffer::add_page(DiskBufferPool *bp, PageNum page_num, Page return bp->write_page(page_num, page); } +} \ No newline at end of file diff --git a/src/observer/storage/buffer/double_write_buffer.h b/src/observer/storage/buffer/double_write_buffer.h index ce42c96a5..6ca9fbeb7 100644 --- a/src/observer/storage/buffer/double_write_buffer.h +++ b/src/observer/storage/buffer/double_write_buffer.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "common/types.h" #include "common/sys/rc.h" #include "storage/buffer/page.h" - +namespace oceanbase{ class DiskBufferPool; struct DoubleWritePage; class BufferPoolManager; @@ -167,3 +167,4 @@ class VacuousDoubleWriteBuffer : public DoubleWriteBuffer */ RC clear_pages(DiskBufferPool *bp) override { return RC::SUCCESS; } }; +} \ No newline at end of file diff --git a/src/observer/storage/buffer/frame.cpp b/src/observer/storage/buffer/frame.cpp index c61972e3a..04267448f 100644 --- a/src/observer/storage/buffer/frame.cpp +++ b/src/observer/storage/buffer/frame.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/buffer/frame.h" #include "session/session.h" #include "session/thread_data.h" - +namespace oceanbase{ FrameId::FrameId(int buffer_pool_id, PageNum page_num) : buffer_pool_id_(buffer_pool_id), page_num_(page_num) {} bool FrameId::equal_to(const FrameId &other) const @@ -265,3 +265,4 @@ string Frame::to_string() const << ", lsn=" << lsn() << ", this=" << this; return ss.str(); } +} \ No newline at end of file diff --git a/src/observer/storage/buffer/frame.h b/src/observer/storage/buffer/frame.h index 2c2e7d182..d5f078f44 100644 --- a/src/observer/storage/buffer/frame.h +++ b/src/observer/storage/buffer/frame.h @@ -24,7 +24,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "common/types.h" #include "storage/buffer/page.h" - +namespace oceanbase{ /** * @brief 页帧标识符 * @ingroup BufferPool @@ -187,3 +187,4 @@ class Frame int write_recursive_count_ = 0; unordered_map read_lockers_; }; +} \ No newline at end of file diff --git a/src/observer/storage/buffer/page.h b/src/observer/storage/buffer/page.h index cc7b02293..e088c957a 100644 --- a/src/observer/storage/buffer/page.h +++ b/src/observer/storage/buffer/page.h @@ -25,7 +25,7 @@ static constexpr PageNum BP_HEADER_PAGE = 0; static constexpr const int BP_PAGE_SIZE = (1 << 13); static constexpr const int BP_PAGE_DATA_SIZE = (BP_PAGE_SIZE - sizeof(LSN) - sizeof(CheckSum)); - +namespace oceanbase{ /** * @brief 表示一个页面，可能放在内存或磁盘上 * @ingroup BufferPool @@ -36,3 +36,4 @@ struct Page CheckSum check_sum; char data[BP_PAGE_DATA_SIZE]; }; +} \ No newline at end of file diff --git a/src/observer/storage/clog/disk_log_handler.cpp b/src/observer/storage/clog/disk_log_handler.cpp index fdce4672f..3a7b79625 100644 --- a/src/observer/storage/clog/disk_log_handler.cpp +++ b/src/observer/storage/clog/disk_log_handler.cpp @@ -22,7 +22,7 @@ using namespace common; //////////////////////////////////////////////////////////////////////////////// // LogHandler - +namespace oceanbase{ RC DiskLogHandler::init(const char *path) { const int max_entry_number_per_file = 1000; @@ -206,3 +206,4 @@ void DiskLogHandler::thread_func() LOG_INFO("log handler thread stopped"); } +} \ No newline at end of file diff --git a/src/observer/storage/clog/disk_log_handler.h b/src/observer/storage/clog/disk_log_handler.h index ff378df2d..9d135af71 100644 --- a/src/observer/storage/clog/disk_log_handler.h +++ b/src/observer/storage/clog/disk_log_handler.h @@ -24,7 +24,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/clog/log_file.h" #include "storage/clog/log_buffer.h" #include "storage/clog/log_handler.h" - +namespace oceanbase{ class LogReplayer; /** @@ -127,3 +127,4 @@ class DiskLogHandler : public LogHandler string path_; /// 日志文件存放的目录 }; +} \ No newline at end of file diff --git a/src/observer/storage/clog/integrated_log_replayer.cpp b/src/observer/storage/clog/integrated_log_replayer.cpp index 008fa14ff..3622b2946 100644 --- a/src/observer/storage/clog/integrated_log_replayer.cpp +++ b/src/observer/storage/clog/integrated_log_replayer.cpp @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/clog/integrated_log_replayer.h" #include "storage/clog/log_entry.h" - +namespace oceanbase{ IntegratedLogReplayer::IntegratedLogReplayer(BufferPoolManager &bpm) : buffer_pool_log_replayer_(bpm), record_log_replayer_(bpm), @@ -66,4 +66,5 @@ RC IntegratedLogReplayer::on_done() } return RC::SUCCESS; +} } \ No newline at end of file diff --git a/src/observer/storage/clog/integrated_log_replayer.h b/src/observer/storage/clog/integrated_log_replayer.h index a281839c1..9616c5eb7 100644 --- a/src/observer/storage/clog/integrated_log_replayer.h +++ b/src/observer/storage/clog/integrated_log_replayer.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record_log.h" #include "storage/index/bplus_tree_log.h" #include "storage/trx/mvcc_trx_log.h" - +namespace oceanbase{ class BufferPoolManager; /** @@ -57,4 +57,5 @@ class IntegratedLogReplayer : public LogReplayer RecordLogReplayer record_log_replayer_; ///< record manager 日志回放器 BplusTreeLogReplayer bplus_tree_log_replayer_; ///< bplus tree 日志回放器 unique_ptr trx_log_replayer_; ///< trx 日志回放器 -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/storage/clog/log_buffer.cpp b/src/observer/storage/clog/log_buffer.cpp index 4cbb10604..1b250ba87 100644 --- a/src/observer/storage/clog/log_buffer.cpp +++ b/src/observer/storage/clog/log_buffer.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/chrono.h" using namespace common; - +namespace oceanbase{ RC LogEntryBuffer::init(LSN lsn, int32_t max_bytes /*= 0*/) { current_lsn_.store(lsn); @@ -104,3 +104,4 @@ int32_t LogEntryBuffer::entry_number() const { return entries_.size(); } +} \ No newline at end of file diff --git a/src/observer/storage/clog/log_buffer.h b/src/observer/storage/clog/log_buffer.h index 815af9144..46963fe6e 100644 --- a/src/observer/storage/clog/log_buffer.h +++ b/src/observer/storage/clog/log_buffer.h @@ -22,7 +22,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/atomic.h" #include "storage/clog/log_module.h" #include "storage/clog/log_entry.h" - +namespace oceanbase{ class LogFileWriter; /** @@ -77,3 +77,4 @@ class LogEntryBuffer int32_t max_bytes_ = 4 * 1024 * 1024; /// 缓冲区最大字节数 }; +} \ No newline at end of file diff --git a/src/observer/storage/clog/log_entry.cpp b/src/observer/storage/clog/log_entry.cpp index 0fbf27882..139d366f9 100644 --- a/src/observer/storage/clog/log_entry.cpp +++ b/src/observer/storage/clog/log_entry.cpp @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/clog/log_entry.h" #include "common/log/log.h" - +namespace oceanbase{ //////////////////////////////////////////////////////////////////////////////// // struct LogHeader @@ -85,3 +85,4 @@ string LogEntry::to_string() const { return header_.to_string(); } +} \ No newline at end of file diff --git a/src/observer/storage/clog/log_entry.h b/src/observer/storage/clog/log_entry.h index d4d2981a3..ef5c584e1 100644 --- a/src/observer/storage/clog/log_entry.h +++ b/src/observer/storage/clog/log_entry.h @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/vector.h" #include "common/lang/string.h" #include "common/lang/memory.h" - +namespace oceanbase{ /** * @brief 描述一条日志头 * @ingroup CLog @@ -87,3 +87,4 @@ class LogEntry LogHeader header_; /// 日志头 vector data_; /// 日志数据 }; +} \ No newline at end of file diff --git a/src/observer/storage/clog/log_file.cpp b/src/observer/storage/clog/log_file.cpp index c15d0ac14..ee12c18ff 100644 --- a/src/observer/storage/clog/log_file.cpp +++ b/src/observer/storage/clog/log_file.cpp @@ -22,7 +22,7 @@ See the Mulan PSL v2 for more details. */ #include "common/io/io.h" using namespace common; - +namespace oceanbase{ RC LogFileReader::open(const char *filename) { filename_ = filename; @@ -337,3 +337,4 @@ RC LogFileManager::next_file(LogFileWriter &file_writer) return file_writer.open(file_path.c_str(), lsn + max_entry_number_per_file_ - 1); } +} \ No newline at end of file diff --git a/src/observer/storage/clog/log_file.h b/src/observer/storage/clog/log_file.h index f5014d42c..412e33f2a 100644 --- a/src/observer/storage/clog/log_file.h +++ b/src/observer/storage/clog/log_file.h @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/filesystem.h" #include "common/lang/fstream.h" #include "common/lang/string.h" - +namespace oceanbase{ class LogEntry; /** @@ -153,3 +153,4 @@ class LogFileManager map log_files_; /// 日志文件名和第一个LSN的映射 }; +} \ No newline at end of file diff --git a/src/observer/storage/clog/log_handler.cpp b/src/observer/storage/clog/log_handler.cpp index 14c49a576..ae85b582f 100644 --- a/src/observer/storage/clog/log_handler.cpp +++ b/src/observer/storage/clog/log_handler.cpp @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "storage/clog/disk_log_handler.h" #include "storage/clog/vacuous_log_handler.h" - +namespace oceanbase{ RC LogHandler::append(LSN &lsn, LogModule::Id module, span data) { vector data_vec(data.begin(), data.end()); @@ -44,4 +44,5 @@ RC LogHandler::create(const char *name, LogHandler *&log_handler) return RC::INVALID_ARGUMENT; } return RC::SUCCESS; +} } \ No newline at end of file diff --git a/src/observer/storage/clog/log_handler.h b/src/observer/storage/clog/log_handler.h index 141df1537..42817174d 100644 --- a/src/observer/storage/clog/log_handler.h +++ b/src/observer/storage/clog/log_handler.h @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/span.h" #include "common/lang/vector.h" #include "storage/clog/log_module.h" - +namespace oceanbase{ /** * @defgroup CLog commit log/redo log */ @@ -105,3 +105,4 @@ class LogHandler */ virtual RC _append(LSN &lsn, LogModule module, vector &&data) = 0; }; +} \ No newline at end of file diff --git a/src/observer/storage/clog/log_module.h b/src/observer/storage/clog/log_module.h index 120617cde..49c3b8c21 100644 --- a/src/observer/storage/clog/log_module.h +++ b/src/observer/storage/clog/log_module.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include - +namespace oceanbase{ /** * @brief 日志模块 * @ingroup CLog @@ -51,4 +51,5 @@ class LogModule private: Id id_; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/storage/clog/log_replayer.h b/src/observer/storage/clog/log_replayer.h index 6ef1292a2..11ca43bad 100644 --- a/src/observer/storage/clog/log_replayer.h +++ b/src/observer/storage/clog/log_replayer.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" - +namespace oceanbase{ class LogEntry; /** @@ -40,3 +40,4 @@ class LogReplayer */ virtual RC on_done() { return RC::SUCCESS; } }; +} \ No newline at end of file diff --git a/src/observer/storage/clog/vacuous_log_handler.h b/src/observer/storage/clog/vacuous_log_handler.h index dbc31c213..f9811571e 100644 --- a/src/observer/storage/clog/vacuous_log_handler.h +++ b/src/observer/storage/clog/vacuous_log_handler.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "storage/clog/log_handler.h" - +namespace oceanbase{ /** * @brief VacuousLogHandler is a log handler implenmentation that do nothing in all methods. * It is used for testing. @@ -44,4 +44,5 @@ class VacuousLogHandler : public LogHandler lsn = 0; return RC::SUCCESS; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/storage/common/arena_allocator.cpp b/src/observer/storage/common/arena_allocator.cpp index 342392a00..d3e8c6a77 100644 --- a/src/observer/storage/common/arena_allocator.cpp +++ b/src/observer/storage/common/arena_allocator.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // found in the LICENSE file. See the AUTHORS file for names of contributors. #include "storage/common/arena_allocator.h" - +namespace oceanbase{ static const int kBlockSize = 4096; Arena::Arena() @@ -70,3 +70,4 @@ char* Arena::AllocateNewBlock(size_t block_bytes) { std::memory_order_relaxed); return result; } +} \ No newline at end of file diff --git a/src/observer/storage/common/arena_allocator.h b/src/observer/storage/common/arena_allocator.h index c9ad05d50..2cc6ce057 100644 --- a/src/observer/storage/common/arena_allocator.h +++ b/src/observer/storage/common/arena_allocator.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include #include #include - +namespace oceanbase{ class Arena { public: @@ -72,3 +72,4 @@ inline char *Arena::Allocate(size_t bytes) } return AllocateFallback(bytes); } +} \ No newline at end of file diff --git a/src/observer/storage/common/chunk.cpp b/src/observer/storage/common/chunk.cpp index 9c7d5bd9d..51c0cce8a 100644 --- a/src/observer/storage/common/chunk.cpp +++ b/src/observer/storage/common/chunk.cpp @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "storage/common/chunk.h" - +namespace oceanbase{ void Chunk::add_column(unique_ptr col, int col_id) { columns_.push_back(std::move(col)); @@ -57,4 +57,5 @@ void Chunk::reset() { columns_.clear(); column_ids_.clear(); +} } \ No newline at end of file diff --git a/src/observer/storage/common/chunk.h b/src/observer/storage/common/chunk.h index 71c53b541..175dfca3a 100644 --- a/src/observer/storage/common/chunk.h +++ b/src/observer/storage/common/chunk.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/memory.h" #include "common/lang/vector.h" #include "storage/common/column.h" - +namespace oceanbase{ /** * @brief A Chunk represents a set of columns. */ @@ -100,3 +100,4 @@ class Chunk // `columnd_ids` store the ids of child operator that need to be output vector column_ids_; }; +} \ No newline at end of file diff --git a/src/observer/storage/common/codec.cpp b/src/observer/storage/common/codec.cpp index a8e363b00..de09dc2ab 100644 --- a/src/observer/storage/common/codec.cpp +++ b/src/observer/storage/common/codec.cpp @@ -14,4 +14,4 @@ const byte_t OrderedCode::term[] = {0x00, 0x01}; const byte_t OrderedCode::lit00[] = {0x00, 0xff}; const byte_t OrderedCode::litff[] = {0xff, 0x00}; const byte_t OrderedCode::inf[] = {0xff, 0xff}; -const byte_t OrderedCode::msb[] = {0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe}; \ No newline at end of file +const byte_t OrderedCode::msb[] = {0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe}; diff --git a/src/observer/storage/common/codec.h b/src/observer/storage/common/codec.h index ed373de70..98be33708 100644 --- a/src/observer/storage/common/codec.h +++ b/src/observer/storage/common/codec.h @@ -23,7 +23,7 @@ See the Mulan PSL v2 for more details. */ using byte_t = unsigned char; using bytes = vector; using float64_t = double_t; - +namespace oceanbase{ // reference: https://github.com/code0xff/orderedcodepp class OrderedCode { @@ -503,3 +503,4 @@ class Codec // } // return rc; // } +} \ No newline at end of file diff --git a/src/observer/storage/common/column.cpp b/src/observer/storage/common/column.cpp index 3bea72665..2dd3236b6 100644 --- a/src/observer/storage/common/column.cpp +++ b/src/observer/storage/common/column.cpp @@ -10,7 +10,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "storage/common/column.h" - +namespace oceanbase{ Column::Column(const FieldMeta &meta, size_t size) : data_(nullptr), count_(0), @@ -173,3 +173,4 @@ void Column::reference(const Column &column) this->attr_type_ = column.attr_type(); this->attr_len_ = column.attr_len(); } +} \ No newline at end of file diff --git a/src/observer/storage/common/column.h b/src/observer/storage/common/column.h index 1eecba7ee..f0c51a4ba 100644 --- a/src/observer/storage/common/column.h +++ b/src/observer/storage/common/column.h @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field_meta.h" #include "storage/common/vector_buffer.h" - +namespace oceanbase{ /** * @brief A column contains multiple values in contiguous memory with a specified type. */ @@ -143,3 +143,4 @@ class Column Type column_type_ = Type::NORMAL_COLUMN; unique_ptr vector_buffer_ = nullptr; }; +} \ No newline at end of file diff --git a/src/observer/storage/common/condition_filter.cpp b/src/observer/storage/common/condition_filter.cpp index 5a62bb10f..70874a59d 100644 --- a/src/observer/storage/common/condition_filter.cpp +++ b/src/observer/storage/common/condition_filter.cpp @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include using namespace common; - +namespace oceanbase{ ConditionFilter::~ConditionFilter() {} DefaultConditionFilter::DefaultConditionFilter() @@ -211,3 +211,4 @@ bool CompositeConditionFilter::filter(const Record &rec) const } return true; } +} \ No newline at end of file diff --git a/src/observer/storage/common/condition_filter.h b/src/observer/storage/common/condition_filter.h index 8fb4e5d18..2e5466874 100644 --- a/src/observer/storage/common/condition_filter.h +++ b/src/observer/storage/common/condition_filter.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/parser/parse.h" - +namespace oceanbase{ class Record; class Table; @@ -88,3 +88,4 @@ class CompositeConditionFilter : public ConditionFilter int filter_num_ = 0; bool memory_owner_ = false; // filters_的内存是否由自己来控制 }; +} \ No newline at end of file diff --git a/src/observer/storage/common/meta_util.cpp b/src/observer/storage/common/meta_util.cpp index e11842d9a..388713a27 100644 --- a/src/observer/storage/common/meta_util.cpp +++ b/src/observer/storage/common/meta_util.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/common/meta_util.h" #include "common/lang/filesystem.h" - +namespace oceanbase{ string db_meta_file(const char *base_dir, const char *db_name) { filesystem::path db_dir = filesystem::path(base_dir); @@ -38,4 +38,5 @@ string table_index_file(const char *base_dir, const char *table_name, const char string table_lob_file(const char *base_dir, const char *table_name) { return filesystem::path(base_dir) / (string(table_name) + TABLE_LOB_SUFFIX); +} } \ No newline at end of file diff --git a/src/observer/storage/common/meta_util.h b/src/observer/storage/common/meta_util.h index 0a299a3e1..6a1638a32 100644 --- a/src/observer/storage/common/meta_util.h +++ b/src/observer/storage/common/meta_util.h @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/lang/string.h" - +namespace oceanbase{ static constexpr const char *DB_META_SUFFIX = ".db"; static constexpr const char *TABLE_META_SUFFIX = ".table"; static constexpr const char *TABLE_META_FILE_PATTERN = ".*\\.table$"; @@ -27,3 +27,4 @@ string table_meta_file(const char *base_dir, const char *table_name); string table_data_file(const char *base_dir, const char *table_name); string table_index_file(const char *base_dir, const char *table_name, const char *index_name); string table_lob_file(const char *base_dir, const char *table_name); +} \ No newline at end of file diff --git a/src/observer/storage/common/vector_buffer.h b/src/observer/storage/common/vector_buffer.h index cfd33228f..4b773a1e3 100644 --- a/src/observer/storage/common/vector_buffer.h +++ b/src/observer/storage/common/vector_buffer.h @@ -3,7 +3,7 @@ #include "storage/common/arena_allocator.h" #include "common/type/string_t.h" #include "common/log/log.h" - +namespace oceanbase{ class VectorBuffer { public: @@ -31,4 +31,5 @@ class VectorBuffer private: Arena heap; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/storage/db/db.cpp b/src/observer/storage/db/db.cpp index a0661fa00..183779167 100644 --- a/src/observer/storage/db/db.cpp +++ b/src/observer/storage/db/db.cpp @@ -29,7 +29,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/clog/integrated_log_replayer.h" using namespace common; - +namespace oceanbase{ Db::~Db() { for (auto &iter : opened_tables_) { @@ -415,3 +415,4 @@ RC Db::init_dblwr_buffer() LogHandler &Db::log_handler() { return *log_handler_; } BufferPoolManager &Db::buffer_pool_manager() { return *buffer_pool_manager_; } TrxKit &Db::trx_kit() { return *trx_kit_; } +} \ No newline at end of file diff --git a/src/observer/storage/db/db.h b/src/observer/storage/db/db.h index 51afce10a..928d740cc 100644 --- a/src/observer/storage/db/db.h +++ b/src/observer/storage/db/db.h @@ -25,7 +25,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/clog/disk_log_handler.h" #include "storage/buffer/double_write_buffer.h" #include "oblsm/include/ob_lsm.h" - +namespace oceanbase{ class Table; class LogHandler; class BufferPoolManager; @@ -148,3 +148,4 @@ class Db LSN check_point_lsn_ = 0; ///< 当前数据库的检查点LSN。会记录到磁盘中。 string storage_engine_; }; +} \ No newline at end of file diff --git a/src/observer/storage/default/default_handler.cpp b/src/observer/storage/default/default_handler.cpp index 48f9e0098..1baea3112 100644 --- a/src/observer/storage/default/default_handler.cpp +++ b/src/observer/storage/default/default_handler.cpp @@ -25,7 +25,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/trx/trx.h" using namespace std; - +namespace oceanbase{ DefaultHandler::DefaultHandler() {} DefaultHandler::~DefaultHandler() noexcept { destroy(); } @@ -180,3 +180,4 @@ RC DefaultHandler::sync() } return rc; } +} \ No newline at end of file diff --git a/src/observer/storage/default/default_handler.h b/src/observer/storage/default/default_handler.h index c63119510..f1ced5f3f 100644 --- a/src/observer/storage/default/default_handler.h +++ b/src/observer/storage/default/default_handler.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/map.h" #include "common/lang/string.h" #include "common/lang/memory.h" - +namespace oceanbase{ class Trx; class TrxKit; @@ -98,3 +98,4 @@ class DefaultHandler map opened_dbs_; ///< 打开的数据库 string storage_engine_; ///< 存储引擎的名称 }; +} \ No newline at end of file diff --git a/src/observer/storage/field/field.cpp b/src/observer/storage/field/field.cpp index b554787d8..e92119a78 100644 --- a/src/observer/storage/field/field.cpp +++ b/src/observer/storage/field/field.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "common/value.h" #include "storage/record/record.h" - +namespace oceanbase{ void Field::set_int(Record &record, int value) { ASSERT(field_->type() == AttrType::INTS, "could not set int value to a non-int field"); @@ -32,4 +32,5 @@ int Field::get_int(const Record &record) return value.get_int(); } -const char *Field::get_data(const Record &record) { return record.data() + field_->offset(); } \ No newline at end of file +const char *Field::get_data(const Record &record) { return record.data() + field_->offset(); } +} \ No newline at end of file diff --git a/src/observer/storage/field/field.h b/src/observer/storage/field/field.h index 7022eb5f1..e4b9c5248 100644 --- a/src/observer/storage/field/field.h +++ b/src/observer/storage/field/field.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field_meta.h" #include "storage/table/table.h" - +namespace oceanbase{ /** * @brief 字段 * @@ -48,3 +48,4 @@ class Field const Table *table_ = nullptr; const FieldMeta *field_ = nullptr; }; +} \ No newline at end of file diff --git a/src/observer/storage/field/field_meta.cpp b/src/observer/storage/field/field_meta.cpp index 571861b69..d0b1c5266 100644 --- a/src/observer/storage/field/field_meta.cpp +++ b/src/observer/storage/field/field_meta.cpp @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse_defs.h" #include "json/json.h" - +namespace oceanbase{ const static Json::StaticString FIELD_NAME("name"); const static Json::StaticString FIELD_TYPE("type"); const static Json::StaticString FIELD_OFFSET("offset"); @@ -139,3 +139,4 @@ RC FieldMeta::from_json(const Json::Value &json_value, FieldMeta &field) int field_id = field_id_value.asInt(); return field.init(name, type, offset, len, visible, field_id); } +} \ No newline at end of file diff --git a/src/observer/storage/field/field_meta.h b/src/observer/storage/field/field_meta.h index 2166b719f..cde4bf5c0 100644 --- a/src/observer/storage/field/field_meta.h +++ b/src/observer/storage/field/field_meta.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "common/lang/string.h" #include "sql/parser/parse_defs.h" - +namespace oceanbase{ namespace Json { class Value; } // namespace Json @@ -58,3 +58,4 @@ class FieldMeta bool visible_; int field_id_; }; +} \ No newline at end of file diff --git a/src/observer/storage/index/bplus_tree.cpp b/src/observer/storage/index/bplus_tree.cpp index 606135ebc..95e2d72b5 100644 --- a/src/observer/storage/index/bplus_tree.cpp +++ b/src/observer/storage/index/bplus_tree.cpp @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/buffer/disk_buffer_pool.h" using namespace common; - +namespace oceanbase{ /** * @brief B+树的第一个页面存放的位置 * @details B+树数据放到Buffer Pool中，Buffer Pool把文件按照固定大小的页面拆分。 @@ -2094,3 +2094,4 @@ RC BplusTreeScanner::fix_user_key( *fixed_key = key_buf; return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/storage/index/bplus_tree.h b/src/observer/storage/index/bplus_tree.h index dd7520564..fb77b1d75 100644 --- a/src/observer/storage/index/bplus_tree.h +++ b/src/observer/storage/index/bplus_tree.h @@ -29,7 +29,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record_manager.h" #include "storage/index/latch_memo.h" #include "storage/index/bplus_tree_log.h" - +namespace oceanbase{ class BplusTreeHandler; class BplusTreeMiniTransaction; @@ -721,3 +721,4 @@ class BplusTreeScanner int iter_index_ = -1; bool first_emitted_ = false; }; +} \ No newline at end of file diff --git a/src/observer/storage/index/bplus_tree_index.cpp b/src/observer/storage/index/bplus_tree_index.cpp index 8794cfbc1..cc9b33ca0 100644 --- a/src/observer/storage/index/bplus_tree_index.cpp +++ b/src/observer/storage/index/bplus_tree_index.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "storage/table/table.h" #include "storage/db/db.h" - +namespace oceanbase{ BplusTreeIndex::~BplusTreeIndex() noexcept { close(); } RC BplusTreeIndex::create(Table *table, const char *file_name, const IndexMeta &index_meta, const FieldMeta &field_meta) @@ -123,3 +123,4 @@ RC BplusTreeIndexScanner::destroy() delete this; return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/storage/index/bplus_tree_index.h b/src/observer/storage/index/bplus_tree_index.h index db0bbc99b..679c5fb48 100644 --- a/src/observer/storage/index/bplus_tree_index.h +++ b/src/observer/storage/index/bplus_tree_index.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/index/bplus_tree.h" #include "storage/index/index.h" - +namespace oceanbase{ /** * @brief B+树索引 * @ingroup Index @@ -67,3 +67,4 @@ class BplusTreeIndexScanner : public IndexScanner private: BplusTreeScanner tree_scanner_; }; +} \ No newline at end of file diff --git a/src/observer/storage/index/bplus_tree_log.cpp b/src/observer/storage/index/bplus_tree_log.cpp index 2225a38e1..ab9b43031 100644 --- a/src/observer/storage/index/bplus_tree_log.cpp +++ b/src/observer/storage/index/bplus_tree_log.cpp @@ -26,7 +26,7 @@ See the Mulan PSL v2 for more details. */ using namespace common; using namespace bplus_tree; - +namespace oceanbase{ /////////////////////////////////////////////////////////////////////////////// // class BplusTreeLogger BplusTreeLogger::BplusTreeLogger(LogHandler &log_handler, int32_t buffer_pool_id) @@ -290,3 +290,4 @@ RC BplusTreeMiniTransaction::rollback() { return logger_.rollback(*this, tree_ha BplusTreeLogReplayer::BplusTreeLogReplayer(BufferPoolManager &bpm) : buffer_pool_manager_(bpm) {} RC BplusTreeLogReplayer::replay(const LogEntry &entry) { return BplusTreeLogger::redo(buffer_pool_manager_, entry); } +} \ No newline at end of file diff --git a/src/observer/storage/index/bplus_tree_log.h b/src/observer/storage/index/bplus_tree_log.h index cb59bdf75..9804ebcf5 100644 --- a/src/observer/storage/index/bplus_tree_log.h +++ b/src/observer/storage/index/bplus_tree_log.h @@ -25,7 +25,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/index/latch_memo.h" #include "storage/clog/log_replayer.h" // #include "storage/index/bplus_tree_log_entry.h" - +namespace oceanbase{ struct IndexFileHeader; class LogEntry; class LogHandler; @@ -206,3 +206,4 @@ class BplusTreeLogReplayer final : public LogReplayer private: BufferPoolManager &buffer_pool_manager_; }; +} \ No newline at end of file diff --git a/src/observer/storage/index/bplus_tree_log_entry.cpp b/src/observer/storage/index/bplus_tree_log_entry.cpp index 615bb52b4..0f767a7bb 100644 --- a/src/observer/storage/index/bplus_tree_log_entry.cpp +++ b/src/observer/storage/index/bplus_tree_log_entry.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/serializer.h" using namespace common; - +namespace oceanbase{ namespace bplus_tree { string LogOperation::to_string() const @@ -606,3 +606,4 @@ RC UpdateRootPageLogEntryHandler::redo(BplusTreeMiniTransaction &mtr, BplusTreeH } } // namespace bplus_tree +} \ No newline at end of file diff --git a/src/observer/storage/index/bplus_tree_log_entry.h b/src/observer/storage/index/bplus_tree_log_entry.h index 7cdab743e..ea9d37998 100644 --- a/src/observer/storage/index/bplus_tree_log_entry.h +++ b/src/observer/storage/index/bplus_tree_log_entry.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/span.h" #include "common/lang/string.h" #include "storage/index/bplus_tree.h" - +namespace oceanbase{ class IndexNodeHandler; class BplusTreeHandler; class BplusTreeMiniTransaction; @@ -377,3 +377,4 @@ class InternalUpdateKeyLogEntryHandler : public NodeLogEntryHandler }; } // namespace bplus_tree +} \ No newline at end of file diff --git a/src/observer/storage/index/index.cpp b/src/observer/storage/index/index.cpp index 6fa51531d..c446aef79 100644 --- a/src/observer/storage/index/index.cpp +++ b/src/observer/storage/index/index.cpp @@ -13,10 +13,11 @@ See the Mulan PSL v2 for more details. */ // #include "storage/index/index.h" - +namespace oceanbase{ 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 diff --git a/src/observer/storage/index/index.h b/src/observer/storage/index/index.h index 67bfe9a55..413850002 100644 --- a/src/observer/storage/index/index.h +++ b/src/observer/storage/index/index.h @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field_meta.h" #include "storage/index/index_meta.h" #include "storage/record/record_manager.h" - +namespace oceanbase{ class IndexScanner; /** @@ -113,3 +113,4 @@ class IndexScanner virtual RC next_entry(RID *rid) = 0; virtual RC destroy() = 0; }; +} \ No newline at end of file diff --git a/src/observer/storage/index/index_meta.cpp b/src/observer/storage/index/index_meta.cpp index 32604b9ff..f67981b89 100644 --- a/src/observer/storage/index/index_meta.cpp +++ b/src/observer/storage/index/index_meta.cpp @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field_meta.h" #include "storage/table/table_meta.h" #include "json/json.h" - +namespace oceanbase{ const static Json::StaticString FIELD_NAME("name"); const static Json::StaticString FIELD_FIELD_NAME("field_name"); @@ -68,4 +68,5 @@ const char *IndexMeta::name() const { return name_.c_str(); } const char *IndexMeta::field() const { return field_.c_str(); } -void IndexMeta::desc(ostream &os) const { os << "index name=" << name_ << ", field=" << field_; } \ No newline at end of file +void IndexMeta::desc(ostream &os) const { os << "index name=" << name_ << ", field=" << field_; } +} \ No newline at end of file diff --git a/src/observer/storage/index/index_meta.h b/src/observer/storage/index/index_meta.h index bb9f948b1..68fdb4b2c 100644 --- a/src/observer/storage/index/index_meta.h +++ b/src/observer/storage/index/index_meta.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "common/lang/string.h" - +namespace oceanbase{ class TableMeta; class FieldMeta; @@ -51,3 +51,4 @@ class IndexMeta string name_; // index's name string field_; // field's name }; +} \ No newline at end of file diff --git a/src/observer/storage/index/ivfflat_index.h b/src/observer/storage/index/ivfflat_index.h index cb09f47ad..6246b9eb1 100644 --- a/src/observer/storage/index/ivfflat_index.h +++ b/src/observer/storage/index/ivfflat_index.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "storage/index/index.h" - +namespace oceanbase{ /** * @brief ivfflat 向量索引 * @ingroup Index @@ -47,3 +47,4 @@ class IvfflatIndex : public Index int lists_ = 1; int probes_ = 1; }; +} \ No newline at end of file diff --git a/src/observer/storage/index/latch_memo.cpp b/src/observer/storage/index/latch_memo.cpp index 05158eda0..c7099c8d1 100644 --- a/src/observer/storage/index/latch_memo.cpp +++ b/src/observer/storage/index/latch_memo.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/mutex.h" #include "storage/buffer/disk_buffer_pool.h" #include "storage/buffer/frame.h" - +namespace oceanbase{ LatchMemoItem::LatchMemoItem(LatchMemoType type, Frame *frame) { this->type = type; @@ -158,3 +158,4 @@ void LatchMemo::release_to(int point) } items_.erase(items_.begin(), iter); } +} \ No newline at end of file diff --git a/src/observer/storage/index/latch_memo.h b/src/observer/storage/index/latch_memo.h index b729db542..fb4ac0975 100644 --- a/src/observer/storage/index/latch_memo.h +++ b/src/observer/storage/index/latch_memo.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/deque.h" #include "common/lang/vector.h" #include "storage/buffer/page.h" - +namespace oceanbase{ class Frame; class DiskBufferPool; @@ -88,3 +88,4 @@ class LatchMemo final deque items_; vector disposed_pages_; /// 等待释放的页面 }; +} \ No newline at end of file diff --git a/src/observer/storage/persist/persist.cpp b/src/observer/storage/persist/persist.cpp index 866a95878..d1f423a2f 100644 --- a/src/observer/storage/persist/persist.cpp +++ b/src/observer/storage/persist/persist.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "persist.h" - +namespace oceanbase{ PersistHandler::PersistHandler() {} PersistHandler::~PersistHandler() { close_file(); } @@ -282,3 +282,4 @@ RC PersistHandler::seek(uint64_t offset) return rc; } +} \ No newline at end of file diff --git a/src/observer/storage/persist/persist.h b/src/observer/storage/persist/persist.h index 45f61f7dc..d5399887c 100644 --- a/src/observer/storage/persist/persist.h +++ b/src/observer/storage/persist/persist.h @@ -23,7 +23,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "common/lang/string.h" - +namespace oceanbase{ class PersistHandler { public: @@ -64,3 +64,4 @@ class PersistHandler string file_name_; int file_desc_ = -1; }; +} \ No newline at end of file diff --git a/src/observer/storage/record/heap_record_scanner.cpp b/src/observer/storage/record/heap_record_scanner.cpp index cc1182429..e680ec1f6 100644 --- a/src/observer/storage/record/heap_record_scanner.cpp +++ b/src/observer/storage/record/heap_record_scanner.cpp @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/heap_record_scanner.h" //////////////////////////////////////////////////////////////////////////////// - +namespace oceanbase{ RC HeapRecordScanner::open_scan() { @@ -145,3 +145,4 @@ RC HeapRecordScanner::next(Record &record) record = next_record_; return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/storage/record/heap_record_scanner.h b/src/observer/storage/record/heap_record_scanner.h index 2915eeaef..0b9f9372e 100644 --- a/src/observer/storage/record/heap_record_scanner.h +++ b/src/observer/storage/record/heap_record_scanner.h @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record_scanner.h" #include "storage/buffer/disk_buffer_pool.h" #include "storage/trx/trx.h" - +namespace oceanbase{ /** * @brief 遍历某个文件中所有记录 * @ingroup RecordManager @@ -75,4 +75,5 @@ class HeapRecordScanner : public RecordScanner RecordPageHandler *record_page_handler_ = nullptr; ///< 处理文件某页面的记录 RecordPageIterator record_page_iterator_; ///< 遍历某个页面上的所有record Record next_record_; ///< 获取的记录放在这里缓存起来 -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/storage/record/lob_handler.cpp b/src/observer/storage/record/lob_handler.cpp index b7905170e..65e5047df 100644 --- a/src/observer/storage/record/lob_handler.cpp +++ b/src/observer/storage/record/lob_handler.cpp @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "storage/record/lob_handler.h" - +namespace oceanbase{ RC LobFileHandler::create_file(const char *file_name) { return file_.create_file(file_name); @@ -42,3 +42,4 @@ RC LobFileHandler::insert_data(int64_t &offset, int64_t length, const char *data return rc; } +} \ No newline at end of file diff --git a/src/observer/storage/record/lob_handler.h b/src/observer/storage/record/lob_handler.h index 99d86798a..9da8e49b7 100644 --- a/src/observer/storage/record/lob_handler.h +++ b/src/observer/storage/record/lob_handler.h @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/sstream.h" #include "common/types.h" #include "storage/persist/persist.h" - +namespace oceanbase{ /** * @brief 管理LOB文件中的 LOB 对象 * @ingroup RecordManager @@ -38,4 +38,5 @@ class LobFileHandler private: PersistHandler file_; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/storage/record/lsm_record_scanner.cpp b/src/observer/storage/record/lsm_record_scanner.cpp index 59eef6850..af1be499a 100644 --- a/src/observer/storage/record/lsm_record_scanner.cpp +++ b/src/observer/storage/record/lsm_record_scanner.cpp @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/lsm_record_scanner.h" #include "storage/common/codec.h" #include "storage/trx/lsm_mvcc_trx.h" - +namespace oceanbase{ RC LsmRecordScanner::open_scan() { RC rc = RC::SUCCESS; @@ -66,4 +66,5 @@ RC LsmRecordScanner::next(Record &record) return RC::RECORD_EOF; } return RC::SUCCESS; +} } \ No newline at end of file diff --git a/src/observer/storage/record/lsm_record_scanner.h b/src/observer/storage/record/lsm_record_scanner.h index 6407fae27..e573ed8c5 100644 --- a/src/observer/storage/record/lsm_record_scanner.h +++ b/src/observer/storage/record/lsm_record_scanner.h @@ -17,6 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/trx/trx.h" using namespace oceanbase; +namespace oceanbase{ class LsmRecordScanner : public RecordScanner { public: @@ -47,4 +48,5 @@ class LsmRecordScanner : public RecordScanner ObLsmIterator *lsm_iter_ = nullptr; RowTuple tuple_; Record record_; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/storage/record/record.h b/src/observer/storage/record/record.h index 308355193..98827b29b 100644 --- a/src/observer/storage/record/record.h +++ b/src/observer/storage/record/record.h @@ -24,7 +24,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/limits.h" #include "storage/field/field_meta.h" #include "storage/index/index_meta.h" - +namespace oceanbase{ class Field; /** @@ -266,3 +266,4 @@ class Record int len_ = 0; /// 如果不是record自己来管理内存，这个字段可能是无效的 bool owner_ = false; /// 表示当前是否由record来管理内存 }; +} \ No newline at end of file diff --git a/src/observer/storage/record/record_log.cpp b/src/observer/storage/record/record_log.cpp index 3af38bd07..9b9533b17 100644 --- a/src/observer/storage/record/record_log.cpp +++ b/src/observer/storage/record/record_log.cpp @@ -28,7 +28,7 @@ See the Mulan PSL v2 for more details. */ using namespace common; // class RecordOperation - +namespace oceanbase{ string RecordOperation::to_string() const { string ret = std::to_string(type_id()) + ":"; @@ -329,3 +329,4 @@ RC RecordLogReplayer::replay_update(DiskBufferPool &buffer_pool, const RecordLog return rc; } +} \ No newline at end of file diff --git a/src/observer/storage/record/record_log.h b/src/observer/storage/record/record_log.h index 5bf5663b6..7450c0beb 100644 --- a/src/observer/storage/record/record_log.h +++ b/src/observer/storage/record/record_log.h @@ -22,7 +22,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "storage/clog/log_replayer.h" #include "sql/parser/parse_defs.h" - +namespace oceanbase{ struct RID; class LogHandler; class Frame; @@ -153,3 +153,4 @@ class RecordLogReplayer final : public LogReplayer private: BufferPoolManager &bpm_; }; +} \ No newline at end of file diff --git a/src/observer/storage/record/record_manager.cpp b/src/observer/storage/record/record_manager.cpp index 87e5a6105..4195f28f4 100644 --- a/src/observer/storage/record/record_manager.cpp +++ b/src/observer/storage/record/record_manager.cpp @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/clog/log_handler.h" using namespace common; - +namespace oceanbase{ static constexpr int PAGE_HEADER_SIZE = (sizeof(PageHeader)); RecordPageHandler *RecordPageHandler::create(StorageFormat format) { @@ -799,3 +799,4 @@ RC ChunkFileScanner::next_chunk(Chunk &chunk) record_page_handler_->cleanup(); return RC::RECORD_EOF; } +} \ No newline at end of file diff --git a/src/observer/storage/record/record_manager.h b/src/observer/storage/record/record_manager.h index 876e29b28..c0bb043c1 100644 --- a/src/observer/storage/record/record_manager.h +++ b/src/observer/storage/record/record_manager.h @@ -22,7 +22,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record_log.h" #include "storage/record/lob_handler.h" #include "common/types.h" - +namespace oceanbase{ class LogHandler; class ConditionFilter; class RecordPageHandler; @@ -461,3 +461,4 @@ class ChunkFileScanner BufferPoolIterator bp_iterator_; ///< 遍历buffer pool的所有页面 RecordPageHandler *record_page_handler_ = nullptr; ///< 处理文件某页面的记录 }; +} \ No newline at end of file diff --git a/src/observer/storage/record/record_scanner.h b/src/observer/storage/record/record_scanner.h index 463b69724..82b46e27d 100644 --- a/src/observer/storage/record/record_scanner.h +++ b/src/observer/storage/record/record_scanner.h @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record.h" #include "storage/common/condition_filter.h" - +namespace oceanbase{ /** * @brief 遍历某个表中所有记录 * @ingroup RecordManager @@ -39,4 +39,5 @@ class RecordScanner * @param record 返回的下一条记录 */ virtual RC next(Record &record) = 0; -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/storage/table/heap_table_engine.cpp b/src/observer/storage/table/heap_table_engine.cpp index 6348c60e8..4e8843ab9 100644 --- a/src/observer/storage/table/heap_table_engine.cpp +++ b/src/observer/storage/table/heap_table_engine.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/common/meta_util.h" #include "storage/db/db.h" - +namespace oceanbase{ HeapTableEngine::~HeapTableEngine() { if (record_handler_ != nullptr) { @@ -341,3 +341,4 @@ RC HeapTableEngine::open() } return rc; } +} \ No newline at end of file diff --git a/src/observer/storage/table/heap_table_engine.h b/src/observer/storage/table/heap_table_engine.h index 6726f86dc..1921fe262 100644 --- a/src/observer/storage/table/heap_table_engine.h +++ b/src/observer/storage/table/heap_table_engine.h @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/index/index.h" #include "storage/record/record_manager.h" #include "storage/db/db.h" - +namespace oceanbase{ class Table; /** * @brief table engine @@ -60,3 +60,4 @@ class HeapTableEngine : public TableEngine Db *db_; Table *table_; }; +} \ No newline at end of file diff --git a/src/observer/storage/table/lsm_table_engine.cpp b/src/observer/storage/table/lsm_table_engine.cpp index c97d113a2..799d19304 100644 --- a/src/observer/storage/table/lsm_table_engine.cpp +++ b/src/observer/storage/table/lsm_table_engine.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/lsm_record_scanner.h" #include "storage/common/codec.h" #include "storage/trx/lsm_mvcc_trx.h" - +namespace oceanbase{ RC LsmTableEngine::insert_record(Record &record) { RC rc = RC::SUCCESS; @@ -42,4 +42,5 @@ RC LsmTableEngine::get_record_scanner(RecordScanner *&scanner, Trx *trx, ReadWri RC LsmTableEngine::open() { return RC::UNIMPLEMENTED; +} } \ No newline at end of file diff --git a/src/observer/storage/table/lsm_table_engine.h b/src/observer/storage/table/lsm_table_engine.h index be97cacd9..4d4881796 100644 --- a/src/observer/storage/table/lsm_table_engine.h +++ b/src/observer/storage/table/lsm_table_engine.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/db/db.h" #include "oblsm/include/ob_lsm.h" using namespace oceanbase; - +namespace oceanbase{ /** * @brief lsm table engine */ @@ -56,3 +56,4 @@ class LsmTableEngine : public TableEngine ObLsm *lsm_; atomic inc_id_{0}; }; +} \ No newline at end of file diff --git a/src/observer/storage/table/table.cpp b/src/observer/storage/table/table.cpp index 14093fc06..d7ff6026a 100644 --- a/src/observer/storage/table/table.cpp +++ b/src/observer/storage/table/table.cpp @@ -34,7 +34,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/lsm_record_scanner.h" #include "storage/table/heap_table_engine.h" #include "storage/table/lsm_table_engine.h" - +namespace oceanbase{ Table::~Table() { if (lob_handler_ != nullptr) { @@ -297,3 +297,4 @@ RC Table::sync() { return engine_->sync(); } +} \ No newline at end of file diff --git a/src/observer/storage/table/table.h b/src/observer/storage/table/table.h index 0e5f89014..5fe7a02df 100644 --- a/src/observer/storage/table/table.h +++ b/src/observer/storage/table/table.h @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "common/types.h" #include "common/lang/span.h" #include "common/lang/functional.h" - +namespace oceanbase{ struct RID; class Record; class DiskBufferPool; @@ -140,3 +140,4 @@ class Table unique_ptr engine_ = nullptr; LobFileHandler *lob_handler_ = nullptr; }; +} \ No newline at end of file diff --git a/src/observer/storage/table/table_engine.h b/src/observer/storage/table/table_engine.h index 110fbd046..47a33b360 100644 --- a/src/observer/storage/table/table_engine.h +++ b/src/observer/storage/table/table_engine.h @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/functional.h" #include "storage/table/table_meta.h" #include "storage/common/chunk.h" - +namespace oceanbase{ struct RID; class Record; class DiskBufferPool; @@ -60,3 +60,4 @@ class TableEngine protected: TableMeta *table_meta_ = nullptr; }; +} \ No newline at end of file diff --git a/src/observer/storage/table/table_meta.cpp b/src/observer/storage/table/table_meta.cpp index 144881188..91a09c6fa 100644 --- a/src/observer/storage/table/table_meta.cpp +++ b/src/observer/storage/table/table_meta.cpp @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table_meta.h" #include "storage/trx/trx.h" #include "json/json.h" - +namespace oceanbase{ static const Json::StaticString FIELD_TABLE_ID("table_id"); static const Json::StaticString FIELD_TABLE_NAME("table_name"); static const Json::StaticString FIELD_STORAGE_FORMAT("storage_format"); @@ -360,3 +360,4 @@ void TableMeta::desc(ostream &os) const } os << ')' << endl; } +} \ No newline at end of file diff --git a/src/observer/storage/table/table_meta.h b/src/observer/storage/table/table_meta.h index 12bf8f7b4..efccfac7d 100644 --- a/src/observer/storage/table/table_meta.h +++ b/src/observer/storage/table/table_meta.h @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/span.h" #include "storage/field/field_meta.h" #include "storage/index/index_meta.h" - +namespace oceanbase{ /** * @brief 表元数据 * @@ -84,3 +84,4 @@ class TableMeta : public common::Serializable int record_size_ = 0; }; +} \ No newline at end of file diff --git a/src/observer/storage/trx/lsm_mvcc_trx.cpp b/src/observer/storage/trx/lsm_mvcc_trx.cpp index 1f07ef6d6..d400bc1d8 100644 --- a/src/observer/storage/trx/lsm_mvcc_trx.cpp +++ b/src/observer/storage/trx/lsm_mvcc_trx.cpp @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "storage/trx/lsm_mvcc_trx.h" - +namespace oceanbase{ RC LsmMvccTrxKit::init() { return RC::SUCCESS; } const vector *LsmMvccTrxKit::trx_fields() const { return nullptr; } @@ -72,3 +72,4 @@ RC LsmMvccTrx::rollback() * 实际没有使用 */ RC LsmMvccTrx::redo(Db *, const LogEntry &) { return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/storage/trx/lsm_mvcc_trx.h b/src/observer/storage/trx/lsm_mvcc_trx.h index 881eec08d..fc0f40a07 100644 --- a/src/observer/storage/trx/lsm_mvcc_trx.h +++ b/src/observer/storage/trx/lsm_mvcc_trx.h @@ -16,6 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "oblsm/include/ob_lsm_transaction.h" using namespace oceanbase; +namespace oceanbase{ /** * @brief lsm-tree 存储引擎对应的事务管理器 */ @@ -77,4 +78,5 @@ class LsmMvccTrxLogReplayer : public LogReplayer virtual ~LsmMvccTrxLogReplayer() = default; RC replay(const LogEntry &) override { return RC::SUCCESS; } -}; \ No newline at end of file +}; +} \ No newline at end of file diff --git a/src/observer/storage/trx/mvcc_trx.cpp b/src/observer/storage/trx/mvcc_trx.cpp index e9ee76ab5..8723739c0 100644 --- a/src/observer/storage/trx/mvcc_trx.cpp +++ b/src/observer/storage/trx/mvcc_trx.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field.h" #include "storage/trx/mvcc_trx_log.h" #include "common/lang/algorithm.h" - +namespace oceanbase{ MvccTrxKit::~MvccTrxKit() { vector tmp_trxes; @@ -468,3 +468,4 @@ RC MvccTrx::redo(Db *db, const LogEntry &log_entry) return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/storage/trx/mvcc_trx.h b/src/observer/storage/trx/mvcc_trx.h index 8db7c5ba1..1331d8b9a 100644 --- a/src/observer/storage/trx/mvcc_trx.h +++ b/src/observer/storage/trx/mvcc_trx.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/vector.h" #include "storage/trx/trx.h" #include "storage/trx/mvcc_trx_log.h" - +namespace oceanbase{ class CLogManager; class LogHandler; class MvccTrxLogHandler; @@ -113,3 +113,4 @@ class MvccTrx : public Trx bool recovering_ = false; OperationSet operations_; }; +} \ No newline at end of file diff --git a/src/observer/storage/trx/mvcc_trx_log.cpp b/src/observer/storage/trx/mvcc_trx_log.cpp index abb4e7ba1..f1047178e 100644 --- a/src/observer/storage/trx/mvcc_trx_log.cpp +++ b/src/observer/storage/trx/mvcc_trx_log.cpp @@ -22,7 +22,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table.h" using namespace common; - +namespace oceanbase{ string MvccTrxLogOperation::to_string() const { string ret = std::to_string(index()) + ":"; @@ -186,3 +186,4 @@ RC MvccTrxLogReplayer::on_done() return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/storage/trx/mvcc_trx_log.h b/src/observer/storage/trx/mvcc_trx_log.h index 0e670228e..efbb641fa 100644 --- a/src/observer/storage/trx/mvcc_trx_log.h +++ b/src/observer/storage/trx/mvcc_trx_log.h @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/unordered_map.h" #include "storage/record/record.h" #include "storage/clog/log_replayer.h" - +namespace oceanbase{ class LogHandler; class Table; class Db; @@ -162,3 +162,4 @@ class MvccTrxLogReplayer final : public LogReplayer ///< 事务ID到事务的映射。在重做结束后，如果还有未提交的事务，需要回滚。 unordered_map trx_map_; }; +} \ No newline at end of file diff --git a/src/observer/storage/trx/trx.cpp b/src/observer/storage/trx/trx.cpp index 040192755..9ffe1872b 100644 --- a/src/observer/storage/trx/trx.cpp +++ b/src/observer/storage/trx/trx.cpp @@ -22,7 +22,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/trx/lsm_mvcc_trx.h" #include "storage/trx/trx.h" #include "storage/trx/vacuous_trx.h" - +namespace oceanbase{ TrxKit *TrxKit::create(const char *name, Db* db) { TrxKit *trx_kit = nullptr; @@ -46,3 +46,4 @@ TrxKit *TrxKit::create(const char *name, Db* db) return trx_kit; } +} \ No newline at end of file diff --git a/src/observer/storage/trx/trx.h b/src/observer/storage/trx/trx.h index 5aa777d27..10620ec82 100644 --- a/src/observer/storage/trx/trx.h +++ b/src/observer/storage/trx/trx.h @@ -23,7 +23,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field_meta.h" #include "storage/record/record_manager.h" #include "storage/table/table.h" - +namespace oceanbase{ /** * @defgroup Transaction * @brief 事务相关的内容 @@ -160,3 +160,4 @@ class Trx private: TrxKit::Type type_; }; +} \ No newline at end of file diff --git a/src/observer/storage/trx/vacuous_trx.cpp b/src/observer/storage/trx/vacuous_trx.cpp index 737f243b7..40fd76e18 100644 --- a/src/observer/storage/trx/vacuous_trx.cpp +++ b/src/observer/storage/trx/vacuous_trx.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // #include "storage/trx/vacuous_trx.h" - +namespace oceanbase{ RC VacuousTrxKit::init() { return RC::SUCCESS; } const vector *VacuousTrxKit::trx_fields() const { return nullptr; } @@ -43,3 +43,4 @@ RC VacuousTrx::commit() { return RC::SUCCESS; } RC VacuousTrx::rollback() { return RC::SUCCESS; } RC VacuousTrx::redo(Db *, const LogEntry &) { return RC::SUCCESS; } +} \ No newline at end of file diff --git a/src/observer/storage/trx/vacuous_trx.h b/src/observer/storage/trx/vacuous_trx.h index 92adde90f..4b6718569 100644 --- a/src/observer/storage/trx/vacuous_trx.h +++ b/src/observer/storage/trx/vacuous_trx.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "storage/trx/trx.h" - +namespace oceanbase{ /** * @brief Vacuous(真空的)，顾名思义就是没有实现事务功能 */ @@ -63,4 +63,5 @@ class VacuousTrxLogReplayer : public LogReplayer virtual ~VacuousTrxLogReplayer() = default; RC replay(const LogEntry &) override { return RC::SUCCESS; } -}; \ No newline at end of file +}; +} \ No newline at end of file From 0cef485deeff652c1447f8709d8b4309f53adecd Mon Sep 17 00:00:00 2001 From: aradhanahegde Date: Fri, 3 Oct 2025 17:22:07 -0400 Subject: [PATCH 2/7] clang formatted --- src/observer/catalog/catalog.cpp | 2 +- src/observer/catalog/catalog.h | 2 +- src/observer/catalog/table_stats.h | 2 +- src/observer/common/global_context.cpp | 2 +- src/observer/common/global_context.h | 2 +- src/observer/common/ini_setting.h | 2 +- src/observer/common/init.cpp | 2 +- src/observer/common/init.h | 2 +- src/observer/common/type/attr_type.cpp | 2 +- src/observer/common/type/attr_type.h | 2 +- src/observer/common/type/char_type.cpp | 2 +- src/observer/common/type/char_type.h | 2 +- src/observer/common/type/data_type.cpp | 2 +- src/observer/common/type/data_type.h | 2 +- src/observer/common/type/float_type.cpp | 2 +- src/observer/common/type/float_type.h | 2 +- src/observer/common/type/integer_type.cpp | 2 +- src/observer/common/type/integer_type.h | 2 +- src/observer/common/type/string_t.h | 2 +- src/observer/common/type/vector_type.h | 2 +- src/observer/common/types.h | 2 +- src/observer/common/value.cpp | 2 +- src/observer/common/value.h | 2 +- src/observer/event/session_event.cpp | 2 +- src/observer/event/session_event.h | 2 +- src/observer/event/sql_debug.cpp | 2 +- src/observer/event/sql_debug.h | 2 +- src/observer/event/sql_event.cpp | 2 +- src/observer/event/sql_event.h | 2 +- src/observer/event/storage_event.h | 2 +- src/observer/main.cpp | 2 +- src/observer/net/buffered_writer.cpp | 2 +- src/observer/net/buffered_writer.h | 2 +- src/observer/net/cli_communicator.cpp | 2 +- src/observer/net/cli_communicator.h | 2 +- src/observer/net/communicator.cpp | 2 +- src/observer/net/communicator.h | 2 +- src/observer/net/java_thread_pool_thread_handler.cpp | 2 +- src/observer/net/java_thread_pool_thread_handler.h | 2 +- src/observer/net/mysql_communicator.cpp | 2 +- src/observer/net/mysql_communicator.h | 2 +- src/observer/net/one_thread_per_connection_thread_handler.cpp | 2 +- src/observer/net/one_thread_per_connection_thread_handler.h | 2 +- src/observer/net/plain_communicator.cpp | 2 +- src/observer/net/plain_communicator.h | 2 +- src/observer/net/ring_buffer.cpp | 2 +- src/observer/net/ring_buffer.h | 2 +- src/observer/net/server.cpp | 2 +- src/observer/net/server.h | 2 +- src/observer/net/server_param.h | 2 +- src/observer/net/sql_task_handler.cpp | 2 +- src/observer/net/sql_task_handler.h | 2 +- src/observer/net/thread_handler.cpp | 2 +- src/observer/net/thread_handler.h | 2 +- src/observer/session/session.cpp | 2 +- src/observer/session/session.h | 2 +- src/observer/session/session_stage.cpp | 2 +- src/observer/session/session_stage.h | 2 +- src/observer/session/thread_data.cpp | 2 +- src/observer/session/thread_data.h | 2 +- src/observer/sql/executor/analyze_table_executor.cpp | 2 +- src/observer/sql/executor/analyze_table_executor.h | 2 +- src/observer/sql/executor/command_executor.cpp | 2 +- src/observer/sql/executor/command_executor.h | 2 +- src/observer/sql/executor/create_index_executor.cpp | 2 +- src/observer/sql/executor/create_index_executor.h | 2 +- src/observer/sql/executor/create_table_executor.cpp | 2 +- src/observer/sql/executor/create_table_executor.h | 2 +- src/observer/sql/executor/desc_table_executor.cpp | 2 +- src/observer/sql/executor/desc_table_executor.h | 2 +- src/observer/sql/executor/execute_stage.cpp | 2 +- src/observer/sql/executor/execute_stage.h | 2 +- src/observer/sql/executor/help_executor.h | 2 +- src/observer/sql/executor/load_data_executor.cpp | 2 +- src/observer/sql/executor/load_data_executor.h | 2 +- src/observer/sql/executor/set_variable_executor.cpp | 2 +- src/observer/sql/executor/set_variable_executor.h | 2 +- src/observer/sql/executor/show_tables_executor.h | 2 +- src/observer/sql/executor/sql_result.cpp | 2 +- src/observer/sql/executor/sql_result.h | 2 +- src/observer/sql/executor/trx_begin_executor.h | 2 +- src/observer/sql/executor/trx_end_executor.h | 2 +- src/observer/sql/expr/aggregate_hash_table.cpp | 2 +- src/observer/sql/expr/aggregate_hash_table.h | 2 +- src/observer/sql/expr/aggregate_state.cpp | 2 +- src/observer/sql/expr/aggregate_state.h | 2 +- src/observer/sql/expr/aggregator.cpp | 2 +- src/observer/sql/expr/aggregator.h | 2 +- src/observer/sql/expr/arithmetic_operator.hpp | 2 +- src/observer/sql/expr/composite_tuple.cpp | 2 +- src/observer/sql/expr/composite_tuple.h | 2 +- src/observer/sql/expr/expression.cpp | 2 +- src/observer/sql/expr/expression.h | 2 +- src/observer/sql/expr/expression_iterator.cpp | 2 +- src/observer/sql/expr/expression_iterator.h | 2 +- src/observer/sql/expr/expression_tuple.h | 2 +- src/observer/sql/expr/tuple.h | 2 +- src/observer/sql/expr/tuple_cell.cpp | 2 +- src/observer/sql/expr/tuple_cell.h | 2 +- src/observer/sql/operator/aggregate_vec_physical_operator.cpp | 2 +- src/observer/sql/operator/aggregate_vec_physical_operator.h | 2 +- src/observer/sql/operator/calc_logical_operator.h | 2 +- src/observer/sql/operator/calc_physical_operator.h | 2 +- src/observer/sql/operator/delete_logical_operator.cpp | 2 +- src/observer/sql/operator/delete_logical_operator.h | 2 +- src/observer/sql/operator/delete_physical_operator.cpp | 2 +- src/observer/sql/operator/delete_physical_operator.h | 2 +- src/observer/sql/operator/explain_logical_operator.h | 2 +- src/observer/sql/operator/explain_physical_operator.cpp | 2 +- src/observer/sql/operator/explain_physical_operator.h | 2 +- src/observer/sql/operator/expr_vec_physical_operator.cpp | 2 +- src/observer/sql/operator/expr_vec_physical_operator.h | 2 +- src/observer/sql/operator/group_by_logical_operator.cpp | 2 +- src/observer/sql/operator/group_by_logical_operator.h | 2 +- src/observer/sql/operator/group_by_physical_operator.cpp | 2 +- src/observer/sql/operator/group_by_physical_operator.h | 2 +- src/observer/sql/operator/group_by_vec_physical_operator.h | 2 +- src/observer/sql/operator/hash_group_by_physical_operator.cpp | 2 +- src/observer/sql/operator/hash_group_by_physical_operator.h | 2 +- src/observer/sql/operator/hash_join_physical_operator.h | 2 +- src/observer/sql/operator/index_scan_physical_operator.cpp | 2 +- src/observer/sql/operator/index_scan_physical_operator.h | 2 +- src/observer/sql/operator/insert_logical_operator.cpp | 2 +- src/observer/sql/operator/insert_logical_operator.h | 2 +- src/observer/sql/operator/insert_physical_operator.cpp | 2 +- src/observer/sql/operator/insert_physical_operator.h | 2 +- src/observer/sql/operator/join_logical_operator.h | 2 +- src/observer/sql/operator/join_physical_operator.cpp | 2 +- src/observer/sql/operator/join_physical_operator.h | 2 +- src/observer/sql/operator/logical_operator.cpp | 2 +- src/observer/sql/operator/logical_operator.h | 2 +- .../sql/operator/nested_loop_join_physical_operator.cpp | 2 +- src/observer/sql/operator/nested_loop_join_physical_operator.h | 2 +- src/observer/sql/operator/operator_node.h | 2 +- src/observer/sql/operator/physical_operator.cpp | 2 +- src/observer/sql/operator/physical_operator.h | 2 +- src/observer/sql/operator/predicate_logical_operator.cpp | 2 +- src/observer/sql/operator/predicate_logical_operator.h | 2 +- src/observer/sql/operator/predicate_physical_operator.cpp | 2 +- src/observer/sql/operator/predicate_physical_operator.h | 2 +- src/observer/sql/operator/project_logical_operator.cpp | 2 +- src/observer/sql/operator/project_logical_operator.h | 2 +- src/observer/sql/operator/project_physical_operator.cpp | 2 +- src/observer/sql/operator/project_physical_operator.h | 2 +- src/observer/sql/operator/project_vec_physical_operator.cpp | 2 +- src/observer/sql/operator/project_vec_physical_operator.h | 2 +- src/observer/sql/operator/scalar_group_by_physical_operator.cpp | 2 +- src/observer/sql/operator/scalar_group_by_physical_operator.h | 2 +- src/observer/sql/operator/string_list_physical_operator.h | 2 +- src/observer/sql/operator/table_get_logical_operator.cpp | 2 +- src/observer/sql/operator/table_get_logical_operator.h | 2 +- src/observer/sql/operator/table_scan_physical_operator.cpp | 2 +- src/observer/sql/operator/table_scan_physical_operator.h | 2 +- src/observer/sql/operator/table_scan_vec_physical_operator.cpp | 2 +- src/observer/sql/operator/table_scan_vec_physical_operator.h | 2 +- src/observer/sql/optimizer/cascade/cost_model.cpp | 2 +- src/observer/sql/optimizer/cascade/cost_model.h | 2 +- src/observer/sql/optimizer/cascade/group.cpp | 2 +- src/observer/sql/optimizer/cascade/group.h | 2 +- src/observer/sql/optimizer/cascade/group_expr.cpp | 2 +- src/observer/sql/optimizer/cascade/group_expr.h | 2 +- src/observer/sql/optimizer/cascade/implementation_rules.cpp | 2 +- src/observer/sql/optimizer/cascade/implementation_rules.h | 2 +- src/observer/sql/optimizer/cascade/memo.cpp | 2 +- src/observer/sql/optimizer/cascade/memo.h | 2 +- src/observer/sql/optimizer/cascade/optimizer.cpp | 2 +- src/observer/sql/optimizer/cascade/optimizer.h | 2 +- src/observer/sql/optimizer/cascade/optimizer_context.cpp | 2 +- src/observer/sql/optimizer/cascade/optimizer_context.h | 2 +- src/observer/sql/optimizer/cascade/pattern.h | 2 +- src/observer/sql/optimizer/cascade/pending_tasks.h | 2 +- src/observer/sql/optimizer/cascade/property.h | 2 +- src/observer/sql/optimizer/cascade/property_set.h | 2 +- src/observer/sql/optimizer/cascade/rules.cpp | 2 +- src/observer/sql/optimizer/cascade/rules.h | 2 +- src/observer/sql/optimizer/cascade/tasks/apply_rule_task.cpp | 2 +- src/observer/sql/optimizer/cascade/tasks/apply_rule_task.h | 2 +- src/observer/sql/optimizer/cascade/tasks/cascade_task.cpp | 2 +- src/observer/sql/optimizer/cascade/tasks/cascade_task.h | 2 +- src/observer/sql/optimizer/cascade/tasks/e_group_task.cpp | 2 +- src/observer/sql/optimizer/cascade/tasks/e_group_task.h | 2 +- src/observer/sql/optimizer/cascade/tasks/o_expr_task.cpp | 2 +- src/observer/sql/optimizer/cascade/tasks/o_expr_task.h | 2 +- src/observer/sql/optimizer/cascade/tasks/o_group_task.cpp | 2 +- src/observer/sql/optimizer/cascade/tasks/o_group_task.h | 2 +- src/observer/sql/optimizer/cascade/tasks/o_input_task.cpp | 2 +- src/observer/sql/optimizer/cascade/tasks/o_input_task.h | 2 +- src/observer/sql/optimizer/comparison_simplification_rule.cpp | 2 +- src/observer/sql/optimizer/comparison_simplification_rule.h | 2 +- src/observer/sql/optimizer/conjunction_simplification_rule.cpp | 2 +- src/observer/sql/optimizer/conjunction_simplification_rule.h | 2 +- src/observer/sql/optimizer/expression_rewriter.cpp | 2 +- src/observer/sql/optimizer/expression_rewriter.h | 2 +- src/observer/sql/optimizer/logical_plan_generator.cpp | 2 +- src/observer/sql/optimizer/logical_plan_generator.h | 2 +- src/observer/sql/optimizer/optimize_stage.cpp | 2 +- src/observer/sql/optimizer/optimize_stage.h | 2 +- src/observer/sql/optimizer/optimizer_utils.cpp | 2 +- src/observer/sql/optimizer/optimizer_utils.h | 2 +- src/observer/sql/optimizer/physical_plan_generator.cpp | 2 +- src/observer/sql/optimizer/physical_plan_generator.h | 2 +- src/observer/sql/optimizer/predicate_pushdown_rewriter.cpp | 2 +- src/observer/sql/optimizer/predicate_pushdown_rewriter.h | 2 +- src/observer/sql/optimizer/predicate_rewrite.cpp | 2 +- src/observer/sql/optimizer/predicate_rewrite.h | 2 +- src/observer/sql/optimizer/predicate_to_join_rule.h | 2 +- src/observer/sql/optimizer/rewrite_rule.h | 2 +- src/observer/sql/optimizer/rewriter.cpp | 2 +- src/observer/sql/optimizer/rewriter.h | 2 +- src/observer/sql/optimizer/statistics/table_statistics.h | 2 +- src/observer/sql/parser/expression_binder.cpp | 2 +- src/observer/sql/parser/expression_binder.h | 2 +- src/observer/sql/parser/parse.cpp | 2 +- src/observer/sql/parser/parse.h | 2 +- src/observer/sql/parser/parse_defs.h | 2 +- src/observer/sql/parser/parse_stage.cpp | 2 +- src/observer/sql/parser/parse_stage.h | 2 +- src/observer/sql/parser/resolve_stage.cpp | 2 +- src/observer/sql/parser/resolve_stage.h | 2 +- src/observer/sql/plan_cache/plan_cache_stage.h | 2 +- src/observer/sql/query_cache/query_cache_stage.cpp | 2 +- src/observer/sql/query_cache/query_cache_stage.h | 2 +- src/observer/sql/stmt/analyze_table_stmt.cpp | 2 +- src/observer/sql/stmt/analyze_table_stmt.h | 2 +- src/observer/sql/stmt/calc_stmt.h | 2 +- src/observer/sql/stmt/create_index_stmt.cpp | 2 +- src/observer/sql/stmt/create_index_stmt.h | 2 +- src/observer/sql/stmt/create_table_stmt.cpp | 2 +- src/observer/sql/stmt/create_table_stmt.h | 2 +- src/observer/sql/stmt/delete_stmt.cpp | 2 +- src/observer/sql/stmt/delete_stmt.h | 2 +- src/observer/sql/stmt/desc_table_stmt.cpp | 2 +- src/observer/sql/stmt/desc_table_stmt.h | 2 +- src/observer/sql/stmt/exit_stmt.h | 2 +- src/observer/sql/stmt/explain_stmt.cpp | 2 +- src/observer/sql/stmt/explain_stmt.h | 2 +- src/observer/sql/stmt/filter_stmt.cpp | 2 +- src/observer/sql/stmt/filter_stmt.h | 2 +- src/observer/sql/stmt/help_stmt.h | 2 +- src/observer/sql/stmt/insert_stmt.cpp | 2 +- src/observer/sql/stmt/insert_stmt.h | 2 +- src/observer/sql/stmt/load_data_stmt.cpp | 2 +- src/observer/sql/stmt/load_data_stmt.h | 2 +- src/observer/sql/stmt/select_stmt.cpp | 2 +- src/observer/sql/stmt/select_stmt.h | 2 +- src/observer/sql/stmt/set_variable_stmt.h | 2 +- src/observer/sql/stmt/show_tables_stmt.h | 2 +- src/observer/sql/stmt/stmt.cpp | 2 +- src/observer/sql/stmt/stmt.h | 2 +- src/observer/sql/stmt/trx_begin_stmt.h | 2 +- src/observer/sql/stmt/trx_end_stmt.h | 2 +- src/observer/sql/stmt/update_stmt.cpp | 2 +- src/observer/sql/stmt/update_stmt.h | 2 +- src/observer/storage/buffer/buffer_pool_log.cpp | 2 +- src/observer/storage/buffer/buffer_pool_log.h | 2 +- src/observer/storage/buffer/disk_buffer_pool.cpp | 2 +- src/observer/storage/buffer/disk_buffer_pool.h | 2 +- src/observer/storage/buffer/double_write_buffer.cpp | 2 +- src/observer/storage/buffer/double_write_buffer.h | 2 +- src/observer/storage/buffer/frame.cpp | 2 +- src/observer/storage/buffer/frame.h | 2 +- src/observer/storage/buffer/page.h | 2 +- src/observer/storage/clog/disk_log_handler.cpp | 2 +- src/observer/storage/clog/disk_log_handler.h | 2 +- src/observer/storage/clog/integrated_log_replayer.cpp | 2 +- src/observer/storage/clog/integrated_log_replayer.h | 2 +- src/observer/storage/clog/log_buffer.cpp | 2 +- src/observer/storage/clog/log_buffer.h | 2 +- src/observer/storage/clog/log_entry.cpp | 2 +- src/observer/storage/clog/log_entry.h | 2 +- src/observer/storage/clog/log_file.cpp | 2 +- src/observer/storage/clog/log_file.h | 2 +- src/observer/storage/clog/log_handler.cpp | 2 +- src/observer/storage/clog/log_handler.h | 2 +- src/observer/storage/clog/log_module.h | 2 +- src/observer/storage/clog/log_replayer.h | 2 +- src/observer/storage/clog/vacuous_log_handler.h | 2 +- src/observer/storage/common/arena_allocator.cpp | 2 +- src/observer/storage/common/arena_allocator.h | 2 +- src/observer/storage/common/chunk.cpp | 2 +- src/observer/storage/common/chunk.h | 2 +- src/observer/storage/common/codec.h | 2 +- src/observer/storage/common/column.cpp | 2 +- src/observer/storage/common/column.h | 2 +- src/observer/storage/common/condition_filter.cpp | 2 +- src/observer/storage/common/condition_filter.h | 2 +- src/observer/storage/common/meta_util.cpp | 2 +- src/observer/storage/common/meta_util.h | 2 +- src/observer/storage/common/vector_buffer.h | 2 +- src/observer/storage/db/db.cpp | 2 +- src/observer/storage/db/db.h | 2 +- src/observer/storage/default/default_handler.cpp | 2 +- src/observer/storage/default/default_handler.h | 2 +- src/observer/storage/field/field.cpp | 2 +- src/observer/storage/field/field.h | 2 +- src/observer/storage/field/field_meta.cpp | 2 +- src/observer/storage/field/field_meta.h | 2 +- src/observer/storage/index/bplus_tree.cpp | 2 +- src/observer/storage/index/bplus_tree.h | 2 +- src/observer/storage/index/bplus_tree_index.cpp | 2 +- src/observer/storage/index/bplus_tree_index.h | 2 +- src/observer/storage/index/bplus_tree_log.cpp | 2 +- src/observer/storage/index/bplus_tree_log.h | 2 +- src/observer/storage/index/bplus_tree_log_entry.cpp | 2 +- src/observer/storage/index/bplus_tree_log_entry.h | 2 +- src/observer/storage/index/index.cpp | 2 +- src/observer/storage/index/index.h | 2 +- src/observer/storage/index/index_meta.cpp | 2 +- src/observer/storage/index/index_meta.h | 2 +- src/observer/storage/index/ivfflat_index.h | 2 +- src/observer/storage/index/latch_memo.cpp | 2 +- src/observer/storage/index/latch_memo.h | 2 +- src/observer/storage/persist/persist.cpp | 2 +- src/observer/storage/persist/persist.h | 2 +- src/observer/storage/record/heap_record_scanner.cpp | 2 +- src/observer/storage/record/heap_record_scanner.h | 2 +- src/observer/storage/record/lob_handler.cpp | 2 +- src/observer/storage/record/lob_handler.h | 2 +- src/observer/storage/record/lsm_record_scanner.cpp | 2 +- src/observer/storage/record/lsm_record_scanner.h | 2 +- src/observer/storage/record/record.h | 2 +- src/observer/storage/record/record_log.cpp | 2 +- src/observer/storage/record/record_log.h | 2 +- src/observer/storage/record/record_manager.cpp | 2 +- src/observer/storage/record/record_manager.h | 2 +- src/observer/storage/record/record_scanner.h | 2 +- src/observer/storage/table/heap_table_engine.cpp | 2 +- src/observer/storage/table/heap_table_engine.h | 2 +- src/observer/storage/table/lsm_table_engine.cpp | 2 +- src/observer/storage/table/lsm_table_engine.h | 2 +- src/observer/storage/table/table.cpp | 2 +- src/observer/storage/table/table.h | 2 +- src/observer/storage/table/table_engine.h | 2 +- src/observer/storage/table/table_meta.cpp | 2 +- src/observer/storage/table/table_meta.h | 2 +- src/observer/storage/trx/lsm_mvcc_trx.cpp | 2 +- src/observer/storage/trx/lsm_mvcc_trx.h | 2 +- src/observer/storage/trx/mvcc_trx.cpp | 2 +- src/observer/storage/trx/mvcc_trx.h | 2 +- src/observer/storage/trx/mvcc_trx_log.cpp | 2 +- src/observer/storage/trx/mvcc_trx_log.h | 2 +- src/observer/storage/trx/trx.cpp | 2 +- src/observer/storage/trx/trx.h | 2 +- src/observer/storage/trx/vacuous_trx.cpp | 2 +- src/observer/storage/trx/vacuous_trx.h | 2 +- 345 files changed, 345 insertions(+), 345 deletions(-) diff --git a/src/observer/catalog/catalog.cpp b/src/observer/catalog/catalog.cpp index 0d61e72cc..95d34c690 100644 --- a/src/observer/catalog/catalog.cpp +++ b/src/observer/catalog/catalog.cpp @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "catalog/catalog.h" -namespace oceanbase{ +namespace oceanbase { const TableStats &Catalog::get_table_stats(int table_id) { lock_guard lock(mutex_); diff --git a/src/observer/catalog/catalog.h b/src/observer/catalog/catalog.h index 4b1c3ab41..3f61d517d 100644 --- a/src/observer/catalog/catalog.h +++ b/src/observer/catalog/catalog.h @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/unordered_map.h" #include "common/lang/mutex.h" #include "catalog/table_stats.h" -namespace oceanbase{ +namespace oceanbase { /** * @class Catalog * @brief Store metadata, such as table statistics. diff --git a/src/observer/catalog/table_stats.h b/src/observer/catalog/table_stats.h index 5b2c74fcc..c0a61f875 100644 --- a/src/observer/catalog/table_stats.h +++ b/src/observer/catalog/table_stats.h @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #pragma once -namespace oceanbase{ +namespace oceanbase { /** * @class TableStats * @brief Represents statistics related to a table. diff --git a/src/observer/common/global_context.cpp b/src/observer/common/global_context.cpp index 1ab4d43ea..2bddd3cad 100644 --- a/src/observer/common/global_context.cpp +++ b/src/observer/common/global_context.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // #include "common/global_context.h" -namespace oceanbase{ +namespace oceanbase { static GlobalContext global_context; GlobalContext &GlobalContext::instance() { return global_context; } diff --git a/src/observer/common/global_context.h b/src/observer/common/global_context.h index 44f07e7cd..1855a3c9d 100644 --- a/src/observer/common/global_context.h +++ b/src/observer/common/global_context.h @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // #pragma once -namespace oceanbase{ +namespace oceanbase { class BufferPoolManager; class DefaultHandler; class TrxKit; diff --git a/src/observer/common/ini_setting.h b/src/observer/common/ini_setting.h index 5e92eea2e..933d475bc 100644 --- a/src/observer/common/ini_setting.h +++ b/src/observer/common/ini_setting.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once //! this document is used for ini setting -namespace oceanbase{ +namespace oceanbase { #define CLIENT_ADDRESS "CLIENT_ADDRESS" #define MAX_CONNECTION_NUM "MAX_CONNECTION_NUM" #define MAX_CONNECTION_NUM_DEFAULT 8192 diff --git a/src/observer/common/init.cpp b/src/observer/common/init.cpp index 308d36b7e..da6910949 100644 --- a/src/observer/common/init.cpp +++ b/src/observer/common/init.cpp @@ -31,7 +31,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/trx/trx.h" using namespace common; -namespace oceanbase{ +namespace oceanbase { bool *&_get_init() { static bool util_init = false; diff --git a/src/observer/common/init.h b/src/observer/common/init.h index 781808d58..d092a6a0d 100644 --- a/src/observer/common/init.h +++ b/src/observer/common/init.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/conf/ini.h" #include "common/os/process_param.h" -namespace oceanbase{ +namespace oceanbase { int init(common::ProcessParam *processParam); void cleanup(); } \ No newline at end of file diff --git a/src/observer/common/type/attr_type.cpp b/src/observer/common/type/attr_type.cpp index fe7c5b1af..e6230b030 100644 --- a/src/observer/common/type/attr_type.cpp +++ b/src/observer/common/type/attr_type.cpp @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "common/type/attr_type.h" -namespace oceanbase{ +namespace oceanbase { const char *ATTR_TYPE_NAME[] = {"undefined", "chars", "ints", "floats", "vectors", "booleans"}; const char *attr_type_to_string(AttrType type) diff --git a/src/observer/common/type/attr_type.h b/src/observer/common/type/attr_type.h index 4570b2649..c9f90bd2f 100644 --- a/src/observer/common/type/attr_type.h +++ b/src/observer/common/type/attr_type.h @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #pragma once -namespace oceanbase{ +namespace oceanbase { /** * @brief 属性的类型 * @details AttrType 枚举列出了属性的各种数据类型。 diff --git a/src/observer/common/type/char_type.cpp b/src/observer/common/type/char_type.cpp index 15adb60ee..7e1d1f6e3 100644 --- a/src/observer/common/type/char_type.cpp +++ b/src/observer/common/type/char_type.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ #include "common/type/char_type.h" #include "common/value.h" -namespace oceanbase{ +namespace oceanbase { int CharType::compare(const Value &left, const Value &right) const { ASSERT(left.attr_type() == AttrType::CHARS && right.attr_type() == AttrType::CHARS, "invalid type"); diff --git a/src/observer/common/type/char_type.h b/src/observer/common/type/char_type.h index 47a8b7ecf..a44446a6b 100644 --- a/src/observer/common/type/char_type.h +++ b/src/observer/common/type/char_type.h @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "common/type/data_type.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 固定长度的字符串类型 * @ingroup DataType diff --git a/src/observer/common/type/data_type.cpp b/src/observer/common/type/data_type.cpp index c72a2872a..156d43342 100644 --- a/src/observer/common/type/data_type.cpp +++ b/src/observer/common/type/data_type.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ #include "common/type/integer_type.h" #include "common/type/data_type.h" #include "common/type/vector_type.h" -namespace oceanbase{ +namespace oceanbase { // Todo: 实现新数据类型 // your code here diff --git a/src/observer/common/type/data_type.h b/src/observer/common/type/data_type.h index 21a039657..150dcd102 100644 --- a/src/observer/common/type/data_type.h +++ b/src/observer/common/type/data_type.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "common/sys/rc.h" #include "common/type/attr_type.h" -namespace oceanbase{ +namespace oceanbase { class Value; class Column; diff --git a/src/observer/common/type/float_type.cpp b/src/observer/common/type/float_type.cpp index 9bd3eb4f4..40e35ce1a 100644 --- a/src/observer/common/type/float_type.cpp +++ b/src/observer/common/type/float_type.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/value.h" #include "storage/common/column.h" -namespace oceanbase{ +namespace oceanbase { int FloatType::compare(const Value &left, const Value &right) const { ASSERT(left.attr_type() == AttrType::FLOATS, "left type is not float"); diff --git a/src/observer/common/type/float_type.h b/src/observer/common/type/float_type.h index cb188d48a..610483704 100644 --- a/src/observer/common/type/float_type.h +++ b/src/observer/common/type/float_type.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/type/data_type.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 浮点型数据类型 * @ingroup DataType diff --git a/src/observer/common/type/integer_type.cpp b/src/observer/common/type/integer_type.cpp index 2ecf0f576..97a7f8452 100644 --- a/src/observer/common/type/integer_type.cpp +++ b/src/observer/common/type/integer_type.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "common/value.h" #include "storage/common/column.h" -namespace oceanbase{ +namespace oceanbase { int IntegerType::compare(const Value &left, const Value &right) const { ASSERT(left.attr_type() == AttrType::INTS, "left type is not integer"); diff --git a/src/observer/common/type/integer_type.h b/src/observer/common/type/integer_type.h index c3b5822b7..5be22c505 100644 --- a/src/observer/common/type/integer_type.h +++ b/src/observer/common/type/integer_type.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/type/data_type.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 整型类型 * @ingroup DataType diff --git a/src/observer/common/type/string_t.h b/src/observer/common/type/string_t.h index 6fcd23cec..647cc1970 100644 --- a/src/observer/common/type/string_t.h +++ b/src/observer/common/type/string_t.h @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include using namespace std; -namespace oceanbase{ +namespace oceanbase { struct string_t { public: diff --git a/src/observer/common/type/vector_type.h b/src/observer/common/type/vector_type.h index d863f4d69..4dbf75e37 100644 --- a/src/observer/common/type/vector_type.h +++ b/src/observer/common/type/vector_type.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/type/data_type.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 向量类型 * @ingroup DataType diff --git a/src/observer/common/types.h b/src/observer/common/types.h index 2deb61a25..fde3bb011 100644 --- a/src/observer/common/types.h +++ b/src/observer/common/types.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include #include -namespace oceanbase{ +namespace oceanbase { /// 磁盘文件，包括存放数据的文件和索引(B+-Tree)文件，都按照页来组织 /// 每一页都有一个编号，称为PageNum using PageNum = int32_t; diff --git a/src/observer/common/value.cpp b/src/observer/common/value.cpp index 954aedaa7..b2f4a645e 100644 --- a/src/observer/common/value.cpp +++ b/src/observer/common/value.cpp @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/sstream.h" #include "common/lang/string.h" #include "common/log/log.h" -namespace oceanbase{ +namespace oceanbase { Value::Value(int val) { set_int(val); } Value::Value(float val) { set_float(val); } diff --git a/src/observer/common/value.h b/src/observer/common/value.h index 9b18a46bf..bc58a1707 100644 --- a/src/observer/common/value.h +++ b/src/observer/common/value.h @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ #include "common/type/data_type.h" #include "common/type/string_t.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 属性的值 * @ingroup DataType diff --git a/src/observer/event/session_event.cpp b/src/observer/event/session_event.cpp index c5dafaee3..76f97dcfc 100644 --- a/src/observer/event/session_event.cpp +++ b/src/observer/event/session_event.cpp @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "session_event.h" #include "net/communicator.h" -namespace oceanbase{ +namespace oceanbase { SessionEvent::SessionEvent(Communicator *comm) : communicator_(comm), sql_result_(communicator_->session()) {} SessionEvent::~SessionEvent() {} diff --git a/src/observer/event/session_event.h b/src/observer/event/session_event.h index b8a99db12..7fe088d91 100644 --- a/src/observer/event/session_event.h +++ b/src/observer/event/session_event.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "event/sql_debug.h" #include "sql/executor/sql_result.h" -namespace oceanbase{ +namespace oceanbase { class Session; class Communicator; diff --git a/src/observer/event/sql_debug.cpp b/src/observer/event/sql_debug.cpp index e4a7a5331..8300e3032 100644 --- a/src/observer/event/sql_debug.cpp +++ b/src/observer/event/sql_debug.cpp @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "event/sql_debug.h" #include "session/session.h" -namespace oceanbase{ +namespace oceanbase { void SqlDebug::add_debug_info(const string &debug_info) { debug_infos_.push_back(debug_info); } void SqlDebug::clear_debug_info() { debug_infos_.clear(); } diff --git a/src/observer/event/sql_debug.h b/src/observer/event/sql_debug.h index 13f6bf112..3b58f0980 100644 --- a/src/observer/event/sql_debug.h +++ b/src/observer/event/sql_debug.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "common/lang/list.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief SQL调试信息 * @details diff --git a/src/observer/event/sql_event.cpp b/src/observer/event/sql_event.cpp index 173fd8d89..5e798e509 100644 --- a/src/observer/event/sql_event.cpp +++ b/src/observer/event/sql_event.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "event/session_event.h" #include "sql/stmt/stmt.h" -namespace oceanbase{ +namespace oceanbase { SQLStageEvent::SQLStageEvent(SessionEvent *event, const string &sql) : session_event_(event), sql_(sql) {} SQLStageEvent::~SQLStageEvent() noexcept diff --git a/src/observer/event/sql_event.h b/src/observer/event/sql_event.h index 9de0806f8..4eb1f64e7 100644 --- a/src/observer/event/sql_event.h +++ b/src/observer/event/sql_event.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "common/lang/memory.h" #include "sql/operator/physical_operator.h" -namespace oceanbase{ +namespace oceanbase { class SessionEvent; class Stmt; class ParsedSqlNode; diff --git a/src/observer/event/storage_event.h b/src/observer/event/storage_event.h index a9af0ac9c..a60a94cd7 100644 --- a/src/observer/event/storage_event.h +++ b/src/observer/event/storage_event.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/seda/stage_event.h" -namespace oceanbase{ +namespace oceanbase { class SQLStageEvent; class StorageEvent : public common::StageEvent diff --git a/src/observer/main.cpp b/src/observer/main.cpp index 5e6857d46..a61644680 100644 --- a/src/observer/main.cpp +++ b/src/observer/main.cpp @@ -32,7 +32,7 @@ See the Mulan PSL v2 for more details. */ using namespace common; #define NET "NET" -namespace oceanbase{ +namespace oceanbase { static Server *g_server = nullptr; diff --git a/src/observer/net/buffered_writer.cpp b/src/observer/net/buffered_writer.cpp index f72c49d5e..66c1708d7 100644 --- a/src/observer/net/buffered_writer.cpp +++ b/src/observer/net/buffered_writer.cpp @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ #include #include "net/buffered_writer.h" -namespace oceanbase{ +namespace oceanbase { BufferedWriter::BufferedWriter(int fd) : fd_(fd), buffer_() {} BufferedWriter::BufferedWriter(int fd, int32_t size) : fd_(fd), buffer_(size) {} diff --git a/src/observer/net/buffered_writer.h b/src/observer/net/buffered_writer.h index db54680d0..c88badec6 100644 --- a/src/observer/net/buffered_writer.h +++ b/src/observer/net/buffered_writer.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "net/ring_buffer.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 支持以缓存模式写入数据到文件/socket * @details 缓存使用ring buffer实现，当缓存满时会自动刷新缓存。 diff --git a/src/observer/net/cli_communicator.cpp b/src/observer/net/cli_communicator.cpp index 55602949d..7d45fae82 100644 --- a/src/observer/net/cli_communicator.cpp +++ b/src/observer/net/cli_communicator.cpp @@ -26,7 +26,7 @@ See the Mulan PSL v2 for more details. */ using common::MiniobLineReader; const std::string LINE_HISTORY_FILE = "./.miniob.history"; -namespace oceanbase{ +namespace oceanbase { RC CliCommunicator::init(int fd, unique_ptr session, const string &addr) { RC rc = PlainCommunicator::init(fd, std::move(session), addr); diff --git a/src/observer/net/cli_communicator.h b/src/observer/net/cli_communicator.h index 08fa0250c..a4d13f248 100644 --- a/src/observer/net/cli_communicator.h +++ b/src/observer/net/cli_communicator.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "net/plain_communicator.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 用于命令行模式的通讯器 * @ingroup Communicator diff --git a/src/observer/net/communicator.cpp b/src/observer/net/communicator.cpp index 2423b8e66..536531f31 100644 --- a/src/observer/net/communicator.cpp +++ b/src/observer/net/communicator.cpp @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ #include "session/session.h" #include "common/lang/mutex.h" -namespace oceanbase{ +namespace oceanbase { RC Communicator::init(int fd, unique_ptr session, const string &addr) { fd_ = fd; diff --git a/src/observer/net/communicator.h b/src/observer/net/communicator.h index d7b5a902b..fbf216d76 100644 --- a/src/observer/net/communicator.h +++ b/src/observer/net/communicator.h @@ -22,7 +22,7 @@ struct ConnectionContext; class SessionEvent; class Session; class BufferedWriter; -namespace oceanbase{ +namespace oceanbase { /** * @defgroup Communicator * @brief 负责处理与客户端的通讯 diff --git a/src/observer/net/java_thread_pool_thread_handler.cpp b/src/observer/net/java_thread_pool_thread_handler.cpp index dc9d177b9..6c817f34a 100644 --- a/src/observer/net/java_thread_pool_thread_handler.cpp +++ b/src/observer/net/java_thread_pool_thread_handler.cpp @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "common/thread/runnable.h" #include "common/queue/simple_queue.h" -namespace oceanbase{ +namespace oceanbase { using namespace common; /** diff --git a/src/observer/net/java_thread_pool_thread_handler.h b/src/observer/net/java_thread_pool_thread_handler.h index 5397b9f76..9ec22a44a 100644 --- a/src/observer/net/java_thread_pool_thread_handler.h +++ b/src/observer/net/java_thread_pool_thread_handler.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "net/sql_task_handler.h" #include "common/thread/thread_pool_executor.h" #include "common/lang/mutex.h" -namespace oceanbase{ +namespace oceanbase { struct EventCallbackAg; /** diff --git a/src/observer/net/mysql_communicator.cpp b/src/observer/net/mysql_communicator.cpp index 353704fc0..fa65d5699 100644 --- a/src/observer/net/mysql_communicator.cpp +++ b/src/observer/net/mysql_communicator.cpp @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "net/buffered_writer.h" #include "net/mysql_communicator.h" #include "sql/operator/string_list_physical_operator.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief MySQL协议相关实现 * @defgroup MySQLProtocol diff --git a/src/observer/net/mysql_communicator.h b/src/observer/net/mysql_communicator.h index f1183c12c..5f27b1b40 100644 --- a/src/observer/net/mysql_communicator.h +++ b/src/observer/net/mysql_communicator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "net/communicator.h" #include "common/lang/string.h" -namespace oceanbase{ +namespace oceanbase { class SqlResult; class BasePacket; diff --git a/src/observer/net/one_thread_per_connection_thread_handler.cpp b/src/observer/net/one_thread_per_connection_thread_handler.cpp index 9ac79130a..f77539afc 100644 --- a/src/observer/net/one_thread_per_connection_thread_handler.cpp +++ b/src/observer/net/one_thread_per_connection_thread_handler.cpp @@ -24,7 +24,7 @@ See the Mulan PSL v2 for more details. */ #include "net/sql_task_handler.h" using namespace common; -namespace oceanbase{ +namespace oceanbase { class Worker { public: diff --git a/src/observer/net/one_thread_per_connection_thread_handler.h b/src/observer/net/one_thread_per_connection_thread_handler.h index 55e843ffd..e3dc97912 100644 --- a/src/observer/net/one_thread_per_connection_thread_handler.h +++ b/src/observer/net/one_thread_per_connection_thread_handler.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "net/thread_handler.h" #include "common/lang/mutex.h" #include "common/lang/unordered_map.h" -namespace oceanbase{ +namespace oceanbase { class Worker; /** diff --git a/src/observer/net/plain_communicator.cpp b/src/observer/net/plain_communicator.cpp index 73a78feff..79ffc1e81 100644 --- a/src/observer/net/plain_communicator.cpp +++ b/src/observer/net/plain_communicator.cpp @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "net/buffered_writer.h" #include "session/session.h" #include "sql/expr/tuple.h" -namespace oceanbase{ +namespace oceanbase { PlainCommunicator::PlainCommunicator() { send_message_delimiter_.assign(1, '\0'); diff --git a/src/observer/net/plain_communicator.h b/src/observer/net/plain_communicator.h index 7e21ec25b..8c35f541c 100644 --- a/src/observer/net/plain_communicator.h +++ b/src/observer/net/plain_communicator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "net/communicator.h" #include "common/lang/vector.h" -namespace oceanbase{ +namespace oceanbase { class SqlResult; /** diff --git a/src/observer/net/ring_buffer.cpp b/src/observer/net/ring_buffer.cpp index 89535d7fa..186f9cc2b 100644 --- a/src/observer/net/ring_buffer.cpp +++ b/src/observer/net/ring_buffer.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/algorithm.h" #include "common/log/log.h" #include "net/ring_buffer.h" -namespace oceanbase{ +namespace oceanbase { const int32_t DEFAULT_BUFFER_SIZE = 16 * 1024; RingBuffer::RingBuffer() : RingBuffer(DEFAULT_BUFFER_SIZE) {} diff --git a/src/observer/net/ring_buffer.h b/src/observer/net/ring_buffer.h index 52fe1bc95..80babee93 100644 --- a/src/observer/net/ring_buffer.h +++ b/src/observer/net/ring_buffer.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "common/lang/vector.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 环形缓存，当前用于通讯写入数据时的缓存 * @ingroup Communicator diff --git a/src/observer/net/server.cpp b/src/observer/net/server.cpp index 472b74adb..b4c654ab8 100644 --- a/src/observer/net/server.cpp +++ b/src/observer/net/server.cpp @@ -41,7 +41,7 @@ See the Mulan PSL v2 for more details. */ #include "net/sql_task_handler.h" using namespace common; -namespace oceanbase{ +namespace oceanbase { ServerParam::ServerParam() { listen_addr = INADDR_ANY; diff --git a/src/observer/net/server.h b/src/observer/net/server.h index de3ef7915..e154b838c 100644 --- a/src/observer/net/server.h +++ b/src/observer/net/server.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "net/server_param.h" -namespace oceanbase{ +namespace oceanbase { class Communicator; class ThreadHandler; diff --git a/src/observer/net/server_param.h b/src/observer/net/server_param.h index ba2c522ee..5e67ee07c 100644 --- a/src/observer/net/server_param.h +++ b/src/observer/net/server_param.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "net/communicator.h" #include "common/lang/string.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 服务端启动参数 * @ingroup Communicator diff --git a/src/observer/net/sql_task_handler.cpp b/src/observer/net/sql_task_handler.cpp index e4c186e5c..52bfea5f6 100644 --- a/src/observer/net/sql_task_handler.cpp +++ b/src/observer/net/sql_task_handler.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "event/session_event.h" #include "event/sql_event.h" #include "session/session.h" -namespace oceanbase{ +namespace oceanbase { RC SqlTaskHandler::handle_event(Communicator *communicator) { SessionEvent *event = nullptr; diff --git a/src/observer/net/sql_task_handler.h b/src/observer/net/sql_task_handler.h index e0f07cdae..9be9c8824 100644 --- a/src/observer/net/sql_task_handler.h +++ b/src/observer/net/sql_task_handler.h @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse_stage.h" #include "sql/parser/resolve_stage.h" #include "sql/query_cache/query_cache_stage.h" -namespace oceanbase{ +namespace oceanbase { class Communicator; class SQLStageEvent; diff --git a/src/observer/net/thread_handler.cpp b/src/observer/net/thread_handler.cpp index 83f75b130..7c0158e04 100644 --- a/src/observer/net/thread_handler.cpp +++ b/src/observer/net/thread_handler.cpp @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "net/java_thread_pool_thread_handler.h" #include "common/log/log.h" #include "common/lang/string.h" -namespace oceanbase{ +namespace oceanbase { ThreadHandler * ThreadHandler::create(const char *name) { const char *default_name = "one-thread-per-connection"; diff --git a/src/observer/net/thread_handler.h b/src/observer/net/thread_handler.h index 7f5af336b..45cf83380 100644 --- a/src/observer/net/thread_handler.h +++ b/src/observer/net/thread_handler.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" -namespace oceanbase{ +namespace oceanbase { class Communicator; /** diff --git a/src/observer/session/session.cpp b/src/observer/session/session.cpp index aeff643a4..3cd559b9c 100644 --- a/src/observer/session/session.cpp +++ b/src/observer/session/session.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/db/db.h" #include "storage/default/default_handler.h" #include "storage/trx/trx.h" -namespace oceanbase{ +namespace oceanbase { Session &Session::default_session() { static Session session; diff --git a/src/observer/session/session.h b/src/observer/session/session.h index 8a4d1ee83..35f41bb4e 100644 --- a/src/observer/session/session.h +++ b/src/observer/session/session.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/types.h" #include "common/lang/string.h" -namespace oceanbase{ +namespace oceanbase { class Trx; class Db; class SessionEvent; diff --git a/src/observer/session/session_stage.cpp b/src/observer/session/session_stage.cpp index 5399f1a97..9c1f2b91a 100644 --- a/src/observer/session/session_stage.cpp +++ b/src/observer/session/session_stage.cpp @@ -27,7 +27,7 @@ See the Mulan PSL v2 for more details. */ #include "session/session.h" using namespace common; -namespace oceanbase{ +namespace oceanbase { // Destructor SessionStage::~SessionStage() {} diff --git a/src/observer/session/session_stage.h b/src/observer/session/session_stage.h index 0293e37f9..f0d4b1ca3 100644 --- a/src/observer/session/session_stage.h +++ b/src/observer/session/session_stage.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse_stage.h" #include "sql/parser/resolve_stage.h" #include "sql/query_cache/query_cache_stage.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief SEDA处理的stage * @defgroup SQLStage diff --git a/src/observer/session/thread_data.cpp b/src/observer/session/thread_data.cpp index 283ef86a5..94d62a899 100644 --- a/src/observer/session/thread_data.cpp +++ b/src/observer/session/thread_data.cpp @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "session/thread_data.h" #include "session/session.h" -namespace oceanbase{ +namespace oceanbase { thread_local ThreadData *ThreadData::thread_data_; Trx *ThreadData::trx() const { return (session_ == nullptr) ? nullptr : session_->current_trx(); } diff --git a/src/observer/session/thread_data.h b/src/observer/session/thread_data.h index ca5c3d004..02caba3ba 100644 --- a/src/observer/session/thread_data.h +++ b/src/observer/session/thread_data.h @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // #pragma once -namespace oceanbase{ +namespace oceanbase { class Trx; class Session; diff --git a/src/observer/sql/executor/analyze_table_executor.cpp b/src/observer/sql/executor/analyze_table_executor.cpp index e32c814e4..464a3536e 100644 --- a/src/observer/sql/executor/analyze_table_executor.cpp +++ b/src/observer/sql/executor/analyze_table_executor.cpp @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record_scanner.h" using namespace std; -namespace oceanbase{ +namespace oceanbase { RC AnalyzeTableExecutor::execute(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/executor/analyze_table_executor.h b/src/observer/sql/executor/analyze_table_executor.h index 36b401339..9b7b49be5 100644 --- a/src/observer/sql/executor/analyze_table_executor.h +++ b/src/observer/sql/executor/analyze_table_executor.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" -namespace oceanbase{ +namespace oceanbase { class SQLStageEvent; class RecordScanner; diff --git a/src/observer/sql/executor/command_executor.cpp b/src/observer/sql/executor/command_executor.cpp index 5913577a2..0c91efe9a 100644 --- a/src/observer/sql/executor/command_executor.cpp +++ b/src/observer/sql/executor/command_executor.cpp @@ -26,7 +26,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/executor/trx_begin_executor.h" #include "sql/executor/trx_end_executor.h" #include "sql/stmt/stmt.h" -namespace oceanbase{ +namespace oceanbase { RC CommandExecutor::execute(SQLStageEvent *sql_event) { Stmt *stmt = sql_event->stmt(); diff --git a/src/observer/sql/executor/command_executor.h b/src/observer/sql/executor/command_executor.h index acba7617e..c55eea38f 100644 --- a/src/observer/sql/executor/command_executor.h +++ b/src/observer/sql/executor/command_executor.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" -namespace oceanbase{ +namespace oceanbase { class SQLStageEvent; /** diff --git a/src/observer/sql/executor/create_index_executor.cpp b/src/observer/sql/executor/create_index_executor.cpp index 26d7abea3..3a922cb4e 100644 --- a/src/observer/sql/executor/create_index_executor.cpp +++ b/src/observer/sql/executor/create_index_executor.cpp @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "session/session.h" #include "sql/stmt/create_index_stmt.h" #include "storage/table/table.h" -namespace oceanbase{ +namespace oceanbase { RC CreateIndexExecutor::execute(SQLStageEvent *sql_event) { Stmt *stmt = sql_event->stmt(); diff --git a/src/observer/sql/executor/create_index_executor.h b/src/observer/sql/executor/create_index_executor.h index a3a72079c..233200b70 100644 --- a/src/observer/sql/executor/create_index_executor.h +++ b/src/observer/sql/executor/create_index_executor.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" -namespace oceanbase{ +namespace oceanbase { class SQLStageEvent; /** diff --git a/src/observer/sql/executor/create_table_executor.cpp b/src/observer/sql/executor/create_table_executor.cpp index 8437a2a38..7b27ea82d 100644 --- a/src/observer/sql/executor/create_table_executor.cpp +++ b/src/observer/sql/executor/create_table_executor.cpp @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ #include "session/session.h" #include "sql/stmt/create_table_stmt.h" #include "storage/db/db.h" -namespace oceanbase{ +namespace oceanbase { RC CreateTableExecutor::execute(SQLStageEvent *sql_event) { Stmt *stmt = sql_event->stmt(); diff --git a/src/observer/sql/executor/create_table_executor.h b/src/observer/sql/executor/create_table_executor.h index 42f600efa..c1b4a93f1 100644 --- a/src/observer/sql/executor/create_table_executor.h +++ b/src/observer/sql/executor/create_table_executor.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" -namespace oceanbase{ +namespace oceanbase { class SQLStageEvent; /** diff --git a/src/observer/sql/executor/desc_table_executor.cpp b/src/observer/sql/executor/desc_table_executor.cpp index 1e0a9bfe9..78b5bfd27 100644 --- a/src/observer/sql/executor/desc_table_executor.cpp +++ b/src/observer/sql/executor/desc_table_executor.cpp @@ -24,7 +24,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table.h" using namespace std; -namespace oceanbase{ +namespace oceanbase { RC DescTableExecutor::execute(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/executor/desc_table_executor.h b/src/observer/sql/executor/desc_table_executor.h index 83eb49e7b..ff6880291 100644 --- a/src/observer/sql/executor/desc_table_executor.h +++ b/src/observer/sql/executor/desc_table_executor.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" -namespace oceanbase{ +namespace oceanbase { class SQLStageEvent; /** diff --git a/src/observer/sql/executor/execute_stage.cpp b/src/observer/sql/executor/execute_stage.cpp index afb341b77..c32bce231 100644 --- a/src/observer/sql/executor/execute_stage.cpp +++ b/src/observer/sql/executor/execute_stage.cpp @@ -24,7 +24,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/default/default_handler.h" using namespace common; -namespace oceanbase{ +namespace oceanbase { RC ExecuteStage::handle_request(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/executor/execute_stage.h b/src/observer/sql/executor/execute_stage.h index e62251874..8cf0eb45d 100644 --- a/src/observer/sql/executor/execute_stage.h +++ b/src/observer/sql/executor/execute_stage.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" -namespace oceanbase{ +namespace oceanbase { class SQLStageEvent; class SessionEvent; class SelectStmt; diff --git a/src/observer/sql/executor/help_executor.h b/src/observer/sql/executor/help_executor.h index edbe32cc9..206d4b2f1 100644 --- a/src/observer/sql/executor/help_executor.h +++ b/src/observer/sql/executor/help_executor.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "event/sql_event.h" #include "sql/executor/sql_result.h" #include "sql/operator/string_list_physical_operator.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief Help语句执行器 * @ingroup Executor diff --git a/src/observer/sql/executor/load_data_executor.cpp b/src/observer/sql/executor/load_data_executor.cpp index 142d7a16f..30cc2526e 100644 --- a/src/observer/sql/executor/load_data_executor.cpp +++ b/src/observer/sql/executor/load_data_executor.cpp @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/common/chunk.h" using namespace common; -namespace oceanbase{ +namespace oceanbase { RC LoadDataExecutor::execute(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/executor/load_data_executor.h b/src/observer/sql/executor/load_data_executor.h index c9494b700..dd1bfdec2 100644 --- a/src/observer/sql/executor/load_data_executor.h +++ b/src/observer/sql/executor/load_data_executor.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" -namespace oceanbase{ +namespace oceanbase { class SQLStageEvent; class Table; class SqlResult; diff --git a/src/observer/sql/executor/set_variable_executor.cpp b/src/observer/sql/executor/set_variable_executor.cpp index 06e6bc54f..e71e3d84b 100644 --- a/src/observer/sql/executor/set_variable_executor.cpp +++ b/src/observer/sql/executor/set_variable_executor.cpp @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "sql/executor/set_variable_executor.h" -namespace oceanbase{ +namespace oceanbase { RC SetVariableExecutor::execute(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/executor/set_variable_executor.h b/src/observer/sql/executor/set_variable_executor.h index 4ec12af18..8214e6afc 100644 --- a/src/observer/sql/executor/set_variable_executor.h +++ b/src/observer/sql/executor/set_variable_executor.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "event/sql_event.h" #include "session/session.h" #include "sql/stmt/set_variable_stmt.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief SetVariable语句执行器 * @ingroup Executor diff --git a/src/observer/sql/executor/show_tables_executor.h b/src/observer/sql/executor/show_tables_executor.h index d33813dcc..5905b4490 100644 --- a/src/observer/sql/executor/show_tables_executor.h +++ b/src/observer/sql/executor/show_tables_executor.h @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/executor/sql_result.h" #include "sql/operator/string_list_physical_operator.h" #include "storage/db/db.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 显示所有表的执行器 * @ingroup Executor diff --git a/src/observer/sql/executor/sql_result.cpp b/src/observer/sql/executor/sql_result.cpp index 2dc782c6f..38d7ac502 100644 --- a/src/observer/sql/executor/sql_result.cpp +++ b/src/observer/sql/executor/sql_result.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "session/session.h" #include "storage/trx/trx.h" -namespace oceanbase{ +namespace oceanbase { SqlResult::SqlResult(Session *session) : session_(session) {} void SqlResult::set_tuple_schema(const TupleSchema &schema) { tuple_schema_ = schema; } diff --git a/src/observer/sql/executor/sql_result.h b/src/observer/sql/executor/sql_result.h index 9349a368c..a63b0abac 100644 --- a/src/observer/sql/executor/sql_result.h +++ b/src/observer/sql/executor/sql_result.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/memory.h" #include "sql/expr/tuple.h" #include "sql/operator/physical_operator.h" -namespace oceanbase{ +namespace oceanbase { class Session; /** diff --git a/src/observer/sql/executor/trx_begin_executor.h b/src/observer/sql/executor/trx_begin_executor.h index b6ec71c8c..72f3c3bac 100644 --- a/src/observer/sql/executor/trx_begin_executor.h +++ b/src/observer/sql/executor/trx_begin_executor.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "event/sql_event.h" #include "session/session.h" #include "storage/trx/trx.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 事务开始语句的执行器 * @ingroup Executor diff --git a/src/observer/sql/executor/trx_end_executor.h b/src/observer/sql/executor/trx_end_executor.h index 66209559a..8eb9dfc66 100644 --- a/src/observer/sql/executor/trx_end_executor.h +++ b/src/observer/sql/executor/trx_end_executor.h @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ #include "session/session.h" #include "sql/stmt/stmt.h" #include "storage/trx/trx.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 事务结束的执行器，可以是提交或回滚 * @ingroup Executor diff --git a/src/observer/sql/expr/aggregate_hash_table.cpp b/src/observer/sql/expr/aggregate_hash_table.cpp index 92f952082..1b89be3d6 100644 --- a/src/observer/sql/expr/aggregate_hash_table.cpp +++ b/src/observer/sql/expr/aggregate_hash_table.cpp @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/aggregate_state.h" // ----------------------------------StandardAggregateHashTable------------------ -namespace oceanbase{ +namespace oceanbase { RC StandardAggregateHashTable::add_chunk(Chunk &groups_chunk, Chunk &aggrs_chunk) { if (groups_chunk.rows() != aggrs_chunk.rows()) { diff --git a/src/observer/sql/expr/aggregate_hash_table.h b/src/observer/sql/expr/aggregate_hash_table.h index 96df9d73b..81449f33e 100644 --- a/src/observer/sql/expr/aggregate_hash_table.h +++ b/src/observer/sql/expr/aggregate_hash_table.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "common/math/simd_util.h" #include "common/sys/rc.h" #include "sql/expr/expression.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 用于hash group by 的哈希表实现，不支持并发访问。 */ diff --git a/src/observer/sql/expr/aggregate_state.cpp b/src/observer/sql/expr/aggregate_state.cpp index 347b5a314..cbf5ba2fe 100644 --- a/src/observer/sql/expr/aggregate_state.cpp +++ b/src/observer/sql/expr/aggregate_state.cpp @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #ifdef USE_SIMD #include "common/math/simd_util.h" #endif -namespace oceanbase{ +namespace oceanbase { template void SumState::update(const T *values, int size) { diff --git a/src/observer/sql/expr/aggregate_state.h b/src/observer/sql/expr/aggregate_state.h index 839d79b74..3df4c5dd1 100644 --- a/src/observer/sql/expr/aggregate_state.h +++ b/src/observer/sql/expr/aggregate_state.h @@ -10,7 +10,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "common/type/attr_type.h" -namespace oceanbase{ +namespace oceanbase { template class SumState { diff --git a/src/observer/sql/expr/aggregator.cpp b/src/observer/sql/expr/aggregator.cpp index 5ca6ae3f1..dbc9375bd 100644 --- a/src/observer/sql/expr/aggregator.cpp +++ b/src/observer/sql/expr/aggregator.cpp @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/aggregator.h" #include "common/log/log.h" -namespace oceanbase{ +namespace oceanbase { RC SumAggregator::accumulate(const Value &value) { if (value_.attr_type() == AttrType::UNDEFINED) { diff --git a/src/observer/sql/expr/aggregator.h b/src/observer/sql/expr/aggregator.h index 003d6fb4c..0fb409904 100644 --- a/src/observer/sql/expr/aggregator.h +++ b/src/observer/sql/expr/aggregator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/value.h" #include "common/sys/rc.h" -namespace oceanbase{ +namespace oceanbase { class Aggregator { public: diff --git a/src/observer/sql/expr/arithmetic_operator.hpp b/src/observer/sql/expr/arithmetic_operator.hpp index 97729de6a..c429b6e33 100644 --- a/src/observer/sql/expr/arithmetic_operator.hpp +++ b/src/observer/sql/expr/arithmetic_operator.hpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #endif #include "storage/common/column.h" -namespace oceanbase{ +namespace oceanbase { struct Equal { template diff --git a/src/observer/sql/expr/composite_tuple.cpp b/src/observer/sql/expr/composite_tuple.cpp index 1fe391f73..a402558bb 100644 --- a/src/observer/sql/expr/composite_tuple.cpp +++ b/src/observer/sql/expr/composite_tuple.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" using namespace std; -namespace oceanbase{ +namespace oceanbase { int CompositeTuple::cell_num() const { int num = 0; diff --git a/src/observer/sql/expr/composite_tuple.h b/src/observer/sql/expr/composite_tuple.h index a51159c80..407046c7e 100644 --- a/src/observer/sql/expr/composite_tuple.h +++ b/src/observer/sql/expr/composite_tuple.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/expr/tuple.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 组合的Tuple * @ingroup Tuple diff --git a/src/observer/sql/expr/expression.cpp b/src/observer/sql/expr/expression.cpp index 6a8b3c5c2..89ee06021 100644 --- a/src/observer/sql/expr/expression.cpp +++ b/src/observer/sql/expr/expression.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/arithmetic_operator.hpp" using namespace std; -namespace oceanbase{ +namespace oceanbase { RC FieldExpr::get_value(const Tuple &tuple, Value &value) const { return tuple.find_cell(TupleCellSpec(table_name(), field_name()), value); diff --git a/src/observer/sql/expr/expression.h b/src/observer/sql/expr/expression.h index 03e80c3bd..bf13bc9b9 100644 --- a/src/observer/sql/expr/expression.h +++ b/src/observer/sql/expr/expression.h @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field.h" #include "sql/expr/aggregator.h" #include "storage/common/chunk.h" -namespace oceanbase{ +namespace oceanbase { class Tuple; /** diff --git a/src/observer/sql/expr/expression_iterator.cpp b/src/observer/sql/expr/expression_iterator.cpp index 429d8af5b..bd907c9e4 100644 --- a/src/observer/sql/expr/expression_iterator.cpp +++ b/src/observer/sql/expr/expression_iterator.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" using namespace std; -namespace oceanbase{ +namespace oceanbase { RC ExpressionIterator::iterate_child_expr(Expression &expr, function &)> callback) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/expr/expression_iterator.h b/src/observer/sql/expr/expression_iterator.h index fc9adf5ab..3f6412445 100644 --- a/src/observer/sql/expr/expression_iterator.h +++ b/src/observer/sql/expr/expression_iterator.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "common/lang/functional.h" #include "common/lang/memory.h" -namespace oceanbase{ +namespace oceanbase { class Expression; class ExpressionIterator diff --git a/src/observer/sql/expr/expression_tuple.h b/src/observer/sql/expr/expression_tuple.h index 6c5195264..59014cbf8 100644 --- a/src/observer/sql/expr/expression_tuple.h +++ b/src/observer/sql/expr/expression_tuple.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/tuple.h" #include "common/value.h" #include "common/sys/rc.h" -namespace oceanbase{ +namespace oceanbase { template class ExpressionTuple : public Tuple { diff --git a/src/observer/sql/expr/tuple.h b/src/observer/sql/expr/tuple.h index 58fe4d5e3..6714fb139 100644 --- a/src/observer/sql/expr/tuple.h +++ b/src/observer/sql/expr/tuple.h @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse.h" #include "common/value.h" #include "storage/record/record.h" -namespace oceanbase{ +namespace oceanbase { class Table; /** diff --git a/src/observer/sql/expr/tuple_cell.cpp b/src/observer/sql/expr/tuple_cell.cpp index a2ae3a04a..c5b0d25e1 100644 --- a/src/observer/sql/expr/tuple_cell.cpp +++ b/src/observer/sql/expr/tuple_cell.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" using namespace std; -namespace oceanbase{ +namespace oceanbase { TupleCellSpec::TupleCellSpec(const char *table_name, const char *field_name, const char *alias) { if (table_name) { diff --git a/src/observer/sql/expr/tuple_cell.h b/src/observer/sql/expr/tuple_cell.h index 364df2224..3c7b03ba0 100644 --- a/src/observer/sql/expr/tuple_cell.h +++ b/src/observer/sql/expr/tuple_cell.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "storage/field/field_meta.h" -namespace oceanbase{ +namespace oceanbase { class TupleCellSpec final { public: diff --git a/src/observer/sql/operator/aggregate_vec_physical_operator.cpp b/src/observer/sql/operator/aggregate_vec_physical_operator.cpp index c901eb6e0..d493adc02 100644 --- a/src/observer/sql/operator/aggregate_vec_physical_operator.cpp +++ b/src/observer/sql/operator/aggregate_vec_physical_operator.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/composite_tuple.h" using namespace common; -namespace oceanbase{ +namespace oceanbase { AggregateVecPhysicalOperator::AggregateVecPhysicalOperator(vector &&expressions) { aggregate_expressions_ = std::move(expressions); diff --git a/src/observer/sql/operator/aggregate_vec_physical_operator.h b/src/observer/sql/operator/aggregate_vec_physical_operator.h index afd91e1bc..fb91cabbe 100644 --- a/src/observer/sql/operator/aggregate_vec_physical_operator.h +++ b/src/observer/sql/operator/aggregate_vec_physical_operator.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/physical_operator.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 聚合物理算子 (Vectorized) * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/calc_logical_operator.h b/src/observer/sql/operator/calc_logical_operator.h index 1372decf9..d9e0e04aa 100644 --- a/src/observer/sql/operator/calc_logical_operator.h +++ b/src/observer/sql/operator/calc_logical_operator.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/logical_operator.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 逻辑算子描述当前执行计划要做什么 * @details 可以看OptimizeStage中相关的代码 diff --git a/src/observer/sql/operator/calc_physical_operator.h b/src/observer/sql/operator/calc_physical_operator.h index 0d6aca7b0..8098ce212 100644 --- a/src/observer/sql/operator/calc_physical_operator.h +++ b/src/observer/sql/operator/calc_physical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression_tuple.h" #include "sql/operator/physical_operator.h" -namespace oceanbase{ +namespace oceanbase { class CalcPhysicalOperator : public PhysicalOperator { public: diff --git a/src/observer/sql/operator/delete_logical_operator.cpp b/src/observer/sql/operator/delete_logical_operator.cpp index 099410559..5132c8ddd 100644 --- a/src/observer/sql/operator/delete_logical_operator.cpp +++ b/src/observer/sql/operator/delete_logical_operator.cpp @@ -13,6 +13,6 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/delete_logical_operator.h" -namespace oceanbase{ +namespace oceanbase { DeleteLogicalOperator::DeleteLogicalOperator(Table *table) : table_(table) {} } \ No newline at end of file diff --git a/src/observer/sql/operator/delete_logical_operator.h b/src/observer/sql/operator/delete_logical_operator.h index b35a5a72b..2675d221d 100644 --- a/src/observer/sql/operator/delete_logical_operator.h +++ b/src/observer/sql/operator/delete_logical_operator.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/logical_operator.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 逻辑算子，用于执行delete语句 * @ingroup LogicalOperator diff --git a/src/observer/sql/operator/delete_physical_operator.cpp b/src/observer/sql/operator/delete_physical_operator.cpp index 88dc51c76..acba338ae 100644 --- a/src/observer/sql/operator/delete_physical_operator.cpp +++ b/src/observer/sql/operator/delete_physical_operator.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "storage/table/table.h" #include "storage/trx/trx.h" -namespace oceanbase{ +namespace oceanbase { RC DeletePhysicalOperator::open(Trx *trx) { if (children_.empty()) { diff --git a/src/observer/sql/operator/delete_physical_operator.h b/src/observer/sql/operator/delete_physical_operator.h index cb1e30862..668569892 100644 --- a/src/observer/sql/operator/delete_physical_operator.h +++ b/src/observer/sql/operator/delete_physical_operator.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/physical_operator.h" -namespace oceanbase{ +namespace oceanbase { class Trx; class DeleteStmt; diff --git a/src/observer/sql/operator/explain_logical_operator.h b/src/observer/sql/operator/explain_logical_operator.h index 29576b6e8..34d2066d7 100644 --- a/src/observer/sql/operator/explain_logical_operator.h +++ b/src/observer/sql/operator/explain_logical_operator.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/logical_operator.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief Explain逻辑算子 * @ingroup LogicalOperator diff --git a/src/observer/sql/operator/explain_physical_operator.cpp b/src/observer/sql/operator/explain_physical_operator.cpp index 48dee4f22..7725902e8 100644 --- a/src/observer/sql/operator/explain_physical_operator.cpp +++ b/src/observer/sql/operator/explain_physical_operator.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" using namespace std; -namespace oceanbase{ +namespace oceanbase { RC ExplainPhysicalOperator::open(Trx *) { ASSERT(children_.size() == 1, "explain must has 1 child"); diff --git a/src/observer/sql/operator/explain_physical_operator.h b/src/observer/sql/operator/explain_physical_operator.h index b86ba5e63..c9b22f091 100644 --- a/src/observer/sql/operator/explain_physical_operator.h +++ b/src/observer/sql/operator/explain_physical_operator.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/physical_operator.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief Explain物理算子 * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/expr_vec_physical_operator.cpp b/src/observer/sql/operator/expr_vec_physical_operator.cpp index 05f3209e8..45c21b105 100644 --- a/src/observer/sql/operator/expr_vec_physical_operator.cpp +++ b/src/observer/sql/operator/expr_vec_physical_operator.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; -namespace oceanbase{ +namespace oceanbase { ExprVecPhysicalOperator::ExprVecPhysicalOperator(vector &&expressions) { expressions_ = std::move(expressions); diff --git a/src/observer/sql/operator/expr_vec_physical_operator.h b/src/observer/sql/operator/expr_vec_physical_operator.h index 252e6faa7..371786a22 100644 --- a/src/observer/sql/operator/expr_vec_physical_operator.h +++ b/src/observer/sql/operator/expr_vec_physical_operator.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/physical_operator.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 表达式物理算子(Vectorized) * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/group_by_logical_operator.cpp b/src/observer/sql/operator/group_by_logical_operator.cpp index 6b5d80a34..f3f9d83fa 100644 --- a/src/observer/sql/operator/group_by_logical_operator.cpp +++ b/src/observer/sql/operator/group_by_logical_operator.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" using namespace std; -namespace oceanbase{ +namespace oceanbase { GroupByLogicalOperator::GroupByLogicalOperator(vector> &&group_by_exprs, vector &&expressions) { diff --git a/src/observer/sql/operator/group_by_logical_operator.h b/src/observer/sql/operator/group_by_logical_operator.h index a8a93c5c4..1a1b25e1b 100644 --- a/src/observer/sql/operator/group_by_logical_operator.h +++ b/src/observer/sql/operator/group_by_logical_operator.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/logical_operator.h" -namespace oceanbase{ +namespace oceanbase { class GroupByLogicalOperator : public LogicalOperator { public: diff --git a/src/observer/sql/operator/group_by_physical_operator.cpp b/src/observer/sql/operator/group_by_physical_operator.cpp index cb0ecfad6..503682244 100644 --- a/src/observer/sql/operator/group_by_physical_operator.cpp +++ b/src/observer/sql/operator/group_by_physical_operator.cpp @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; -namespace oceanbase{ +namespace oceanbase { GroupByPhysicalOperator::GroupByPhysicalOperator(vector &&expressions) { aggregate_expressions_ = std::move(expressions); diff --git a/src/observer/sql/operator/group_by_physical_operator.h b/src/observer/sql/operator/group_by_physical_operator.h index 0a108013b..cfadcbc98 100644 --- a/src/observer/sql/operator/group_by_physical_operator.h +++ b/src/observer/sql/operator/group_by_physical_operator.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/tuple.h" #include "sql/operator/physical_operator.h" #include "sql/expr/composite_tuple.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief Group By 物理算子基类 * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/group_by_vec_physical_operator.h b/src/observer/sql/operator/group_by_vec_physical_operator.h index d6fbe175a..578b2be6f 100644 --- a/src/observer/sql/operator/group_by_vec_physical_operator.h +++ b/src/observer/sql/operator/group_by_vec_physical_operator.h @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/aggregate_hash_table.h" #include "sql/operator/physical_operator.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief Group By 物理算子(vectorized) * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/hash_group_by_physical_operator.cpp b/src/observer/sql/operator/hash_group_by_physical_operator.cpp index 678a13e07..0f33cf53e 100644 --- a/src/observer/sql/operator/hash_group_by_physical_operator.cpp +++ b/src/observer/sql/operator/hash_group_by_physical_operator.cpp @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; -namespace oceanbase{ +namespace oceanbase { HashGroupByPhysicalOperator::HashGroupByPhysicalOperator( vector> &&group_by_exprs, vector &&expressions) : GroupByPhysicalOperator(std::move(expressions)), group_by_exprs_(std::move(group_by_exprs)) diff --git a/src/observer/sql/operator/hash_group_by_physical_operator.h b/src/observer/sql/operator/hash_group_by_physical_operator.h index 5003c2b42..00ae47fc5 100644 --- a/src/observer/sql/operator/hash_group_by_physical_operator.h +++ b/src/observer/sql/operator/hash_group_by_physical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/group_by_physical_operator.h" #include "sql/expr/composite_tuple.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief Group By Hash 方式物理算子 * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/hash_join_physical_operator.h b/src/observer/sql/operator/hash_join_physical_operator.h index 6adcc21ff..c3ef44fad 100644 --- a/src/observer/sql/operator/hash_join_physical_operator.h +++ b/src/observer/sql/operator/hash_join_physical_operator.h @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "sql/parser/parse.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief Hash Join 算子 * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/index_scan_physical_operator.cpp b/src/observer/sql/operator/index_scan_physical_operator.cpp index d8061c7b0..89eb0f6db 100644 --- a/src/observer/sql/operator/index_scan_physical_operator.cpp +++ b/src/observer/sql/operator/index_scan_physical_operator.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/index_scan_physical_operator.h" #include "storage/index/index.h" #include "storage/trx/trx.h" -namespace oceanbase{ +namespace oceanbase { IndexScanPhysicalOperator::IndexScanPhysicalOperator(Table *table, Index *index, ReadWriteMode mode, const Value *left_value, bool left_inclusive, const Value *right_value, bool right_inclusive) : table_(table), diff --git a/src/observer/sql/operator/index_scan_physical_operator.h b/src/observer/sql/operator/index_scan_physical_operator.h index 1a51c52d9..06da7d357 100644 --- a/src/observer/sql/operator/index_scan_physical_operator.h +++ b/src/observer/sql/operator/index_scan_physical_operator.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/tuple.h" #include "sql/operator/physical_operator.h" #include "storage/record/record_manager.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 索引扫描物理算子 * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/insert_logical_operator.cpp b/src/observer/sql/operator/insert_logical_operator.cpp index 1b9d2a6c0..0ec1ef8e4 100644 --- a/src/observer/sql/operator/insert_logical_operator.cpp +++ b/src/observer/sql/operator/insert_logical_operator.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/insert_logical_operator.h" -namespace oceanbase{ +namespace oceanbase { InsertLogicalOperator::InsertLogicalOperator(Table *table, vector values) : table_(table), values_(values) {} } \ No newline at end of file diff --git a/src/observer/sql/operator/insert_logical_operator.h b/src/observer/sql/operator/insert_logical_operator.h index 902e6163e..bb8491461 100644 --- a/src/observer/sql/operator/insert_logical_operator.h +++ b/src/observer/sql/operator/insert_logical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/logical_operator.h" #include "sql/parser/parse_defs.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 插入逻辑算子 * @ingroup LogicalOperator diff --git a/src/observer/sql/operator/insert_physical_operator.cpp b/src/observer/sql/operator/insert_physical_operator.cpp index 921474269..841b4cf53 100644 --- a/src/observer/sql/operator/insert_physical_operator.cpp +++ b/src/observer/sql/operator/insert_physical_operator.cpp @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/trx/trx.h" using namespace std; -namespace oceanbase{ +namespace oceanbase { InsertPhysicalOperator::InsertPhysicalOperator(Table *table, vector &&values) : table_(table), values_(std::move(values)) {} diff --git a/src/observer/sql/operator/insert_physical_operator.h b/src/observer/sql/operator/insert_physical_operator.h index d828a393e..c98b0fbb4 100644 --- a/src/observer/sql/operator/insert_physical_operator.h +++ b/src/observer/sql/operator/insert_physical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "sql/parser/parse.h" -namespace oceanbase{ +namespace oceanbase { class InsertStmt; /** diff --git a/src/observer/sql/operator/join_logical_operator.h b/src/observer/sql/operator/join_logical_operator.h index 84d3cddd5..ea602a3c6 100644 --- a/src/observer/sql/operator/join_logical_operator.h +++ b/src/observer/sql/operator/join_logical_operator.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/logical_operator.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 连接算子 * @ingroup LogicalOperator diff --git a/src/observer/sql/operator/join_physical_operator.cpp b/src/observer/sql/operator/join_physical_operator.cpp index d8a351182..303b3ebb0 100644 --- a/src/observer/sql/operator/join_physical_operator.cpp +++ b/src/observer/sql/operator/join_physical_operator.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/join_physical_operator.h" -namespace oceanbase{ +namespace oceanbase { NestedLoopJoinPhysicalOperator::NestedLoopJoinPhysicalOperator() {} RC NestedLoopJoinPhysicalOperator::open(Trx *trx) diff --git a/src/observer/sql/operator/join_physical_operator.h b/src/observer/sql/operator/join_physical_operator.h index 9371e819c..58ec311fe 100644 --- a/src/observer/sql/operator/join_physical_operator.h +++ b/src/observer/sql/operator/join_physical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "sql/parser/parse.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 最简单的两表（称为左表、右表）join算子 * @details 依次遍历左表的每一行，然后关联右表的每一行 diff --git a/src/observer/sql/operator/logical_operator.cpp b/src/observer/sql/operator/logical_operator.cpp index 254c81c6d..f21b0ea52 100644 --- a/src/observer/sql/operator/logical_operator.cpp +++ b/src/observer/sql/operator/logical_operator.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/logical_operator.h" -namespace oceanbase{ +namespace oceanbase { LogicalOperator::~LogicalOperator() {} void LogicalOperator::add_child(unique_ptr oper) { diff --git a/src/observer/sql/operator/logical_operator.h b/src/observer/sql/operator/logical_operator.h index 707e47197..4dc080dfe 100644 --- a/src/observer/sql/operator/logical_operator.h +++ b/src/observer/sql/operator/logical_operator.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "sql/operator/operator_node.h" #include "common/lang/unordered_set.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 逻辑算子 * @defgroup LogicalOperator diff --git a/src/observer/sql/operator/nested_loop_join_physical_operator.cpp b/src/observer/sql/operator/nested_loop_join_physical_operator.cpp index 108b27b85..f1134e5e2 100644 --- a/src/observer/sql/operator/nested_loop_join_physical_operator.cpp +++ b/src/observer/sql/operator/nested_loop_join_physical_operator.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/nested_loop_join_physical_operator.h" -namespace oceanbase{ +namespace oceanbase { NestedLoopJoinPhysicalOperator::NestedLoopJoinPhysicalOperator() {} RC NestedLoopJoinPhysicalOperator::open(Trx *trx) diff --git a/src/observer/sql/operator/nested_loop_join_physical_operator.h b/src/observer/sql/operator/nested_loop_join_physical_operator.h index a9fda0f67..3a6e29ad4 100644 --- a/src/observer/sql/operator/nested_loop_join_physical_operator.h +++ b/src/observer/sql/operator/nested_loop_join_physical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "sql/parser/parse.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 最简单的两表（称为左表、右表）join算子 * @details 依次遍历左表的每一行，然后关联右表的每一行 diff --git a/src/observer/sql/operator/operator_node.h b/src/observer/sql/operator/operator_node.h index e212b2616..b8e1d602e 100644 --- a/src/observer/sql/operator/operator_node.h +++ b/src/observer/sql/operator/operator_node.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/memory.h" #include "sql/optimizer/cascade/property.h" #include "sql/optimizer/cascade/cost_model.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief Operator type(including logical and physical) */ diff --git a/src/observer/sql/operator/physical_operator.cpp b/src/observer/sql/operator/physical_operator.cpp index ecb8e07cb..2334f33f6 100644 --- a/src/observer/sql/operator/physical_operator.cpp +++ b/src/observer/sql/operator/physical_operator.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/physical_operator.h" -namespace oceanbase{ +namespace oceanbase { string physical_operator_type_name(PhysicalOperatorType type) { switch (type) { diff --git a/src/observer/sql/operator/physical_operator.h b/src/observer/sql/operator/physical_operator.h index bac8c615c..a8c71b989 100644 --- a/src/observer/sql/operator/physical_operator.h +++ b/src/observer/sql/operator/physical_operator.h @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ class Record; class TupleCellSpec; class Trx; -namespace oceanbase{ +namespace oceanbase { /** * @brief 物理算子 * @defgroup PhysicalOperator diff --git a/src/observer/sql/operator/predicate_logical_operator.cpp b/src/observer/sql/operator/predicate_logical_operator.cpp index 0e6677205..f726654fe 100644 --- a/src/observer/sql/operator/predicate_logical_operator.cpp +++ b/src/observer/sql/operator/predicate_logical_operator.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/predicate_logical_operator.h" -namespace oceanbase{ +namespace oceanbase { PredicateLogicalOperator::PredicateLogicalOperator(unique_ptr expression) { expressions_.emplace_back(std::move(expression)); diff --git a/src/observer/sql/operator/predicate_logical_operator.h b/src/observer/sql/operator/predicate_logical_operator.h index 2b449dddb..68cbdfa28 100644 --- a/src/observer/sql/operator/predicate_logical_operator.h +++ b/src/observer/sql/operator/predicate_logical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "sql/operator/logical_operator.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 谓词/过滤逻辑算子 * @ingroup LogicalOperator diff --git a/src/observer/sql/operator/predicate_physical_operator.cpp b/src/observer/sql/operator/predicate_physical_operator.cpp index ffed21b02..2f245531c 100644 --- a/src/observer/sql/operator/predicate_physical_operator.cpp +++ b/src/observer/sql/operator/predicate_physical_operator.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/filter_stmt.h" #include "storage/field/field.h" #include "storage/record/record.h" -namespace oceanbase{ +namespace oceanbase { PredicatePhysicalOperator::PredicatePhysicalOperator(std::unique_ptr expr) : expression_(std::move(expr)) { ASSERT(expression_->value_type() == AttrType::BOOLEANS, "predicate's expression should be BOOLEAN type"); diff --git a/src/observer/sql/operator/predicate_physical_operator.h b/src/observer/sql/operator/predicate_physical_operator.h index da49e2625..acbd498e1 100644 --- a/src/observer/sql/operator/predicate_physical_operator.h +++ b/src/observer/sql/operator/predicate_physical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "sql/operator/physical_operator.h" -namespace oceanbase{ +namespace oceanbase { class FilterStmt; /** diff --git a/src/observer/sql/operator/project_logical_operator.cpp b/src/observer/sql/operator/project_logical_operator.cpp index 6f31b6b33..49f09ec7f 100644 --- a/src/observer/sql/operator/project_logical_operator.cpp +++ b/src/observer/sql/operator/project_logical_operator.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/project_logical_operator.h" using namespace std; -namespace oceanbase{ +namespace oceanbase { ProjectLogicalOperator::ProjectLogicalOperator(vector> &&expressions) { expressions_ = std::move(expressions); diff --git a/src/observer/sql/operator/project_logical_operator.h b/src/observer/sql/operator/project_logical_operator.h index f7ebbd165..e703d45ee 100644 --- a/src/observer/sql/operator/project_logical_operator.h +++ b/src/observer/sql/operator/project_logical_operator.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "sql/operator/logical_operator.h" #include "storage/field/field.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief project 表示投影运算 * @ingroup LogicalOperator diff --git a/src/observer/sql/operator/project_physical_operator.cpp b/src/observer/sql/operator/project_physical_operator.cpp index b64542cdc..510a5cb4e 100644 --- a/src/observer/sql/operator/project_physical_operator.cpp +++ b/src/observer/sql/operator/project_physical_operator.cpp @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table.h" using namespace std; -namespace oceanbase{ +namespace oceanbase { ProjectPhysicalOperator::ProjectPhysicalOperator(vector> &&expressions) : expressions_(std::move(expressions)), tuple_(expressions_) { diff --git a/src/observer/sql/operator/project_physical_operator.h b/src/observer/sql/operator/project_physical_operator.h index 0563c500f..25e579e82 100644 --- a/src/observer/sql/operator/project_physical_operator.h +++ b/src/observer/sql/operator/project_physical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "sql/expr/expression_tuple.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 选择/投影物理算子 * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/project_vec_physical_operator.cpp b/src/observer/sql/operator/project_vec_physical_operator.cpp index d61d61fb0..8a834ba2b 100644 --- a/src/observer/sql/operator/project_vec_physical_operator.cpp +++ b/src/observer/sql/operator/project_vec_physical_operator.cpp @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table.h" using namespace std; -namespace oceanbase{ +namespace oceanbase { ProjectVecPhysicalOperator::ProjectVecPhysicalOperator(vector> &&expressions) : expressions_(std::move(expressions)) { diff --git a/src/observer/sql/operator/project_vec_physical_operator.h b/src/observer/sql/operator/project_vec_physical_operator.h index bfaa4cc0e..0e16974b3 100644 --- a/src/observer/sql/operator/project_vec_physical_operator.h +++ b/src/observer/sql/operator/project_vec_physical_operator.h @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "sql/expr/expression_tuple.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 选择/投影物理算子(vectorized) * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/scalar_group_by_physical_operator.cpp b/src/observer/sql/operator/scalar_group_by_physical_operator.cpp index adc15ce68..1c5557b81 100644 --- a/src/observer/sql/operator/scalar_group_by_physical_operator.cpp +++ b/src/observer/sql/operator/scalar_group_by_physical_operator.cpp @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; -namespace oceanbase{ +namespace oceanbase { ScalarGroupByPhysicalOperator::ScalarGroupByPhysicalOperator(vector &&expressions) : GroupByPhysicalOperator(std::move(expressions)) {} diff --git a/src/observer/sql/operator/scalar_group_by_physical_operator.h b/src/observer/sql/operator/scalar_group_by_physical_operator.h index 9d2154b45..d44f1ae17 100644 --- a/src/observer/sql/operator/scalar_group_by_physical_operator.h +++ b/src/observer/sql/operator/scalar_group_by_physical_operator.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/group_by_physical_operator.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 没有 group by 表达式的 group by 物理算子 * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/string_list_physical_operator.h b/src/observer/sql/operator/string_list_physical_operator.h index 88d81415e..81d22b5b9 100644 --- a/src/observer/sql/operator/string_list_physical_operator.h +++ b/src/observer/sql/operator/string_list_physical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/initializer_list.h" #include "sql/operator/physical_operator.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 字符串列表物理算子 * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/table_get_logical_operator.cpp b/src/observer/sql/operator/table_get_logical_operator.cpp index 09dcc058f..fa0b2c14d 100644 --- a/src/observer/sql/operator/table_get_logical_operator.cpp +++ b/src/observer/sql/operator/table_get_logical_operator.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/table_get_logical_operator.h" #include "sql/optimizer/cascade/property.h" #include "catalog/catalog.h" -namespace oceanbase{ +namespace oceanbase { TableGetLogicalOperator::TableGetLogicalOperator(Table *table, ReadWriteMode mode) : LogicalOperator(), table_(table), mode_(mode) {} diff --git a/src/observer/sql/operator/table_get_logical_operator.h b/src/observer/sql/operator/table_get_logical_operator.h index 2dd473038..2ac8bdf8d 100644 --- a/src/observer/sql/operator/table_get_logical_operator.h +++ b/src/observer/sql/operator/table_get_logical_operator.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/logical_operator.h" #include "storage/field/field.h" #include "common/types.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 表示从表中获取数据的算子 * @details 比如使用全表扫描、通过索引获取数据等 diff --git a/src/observer/sql/operator/table_scan_physical_operator.cpp b/src/observer/sql/operator/table_scan_physical_operator.cpp index 129d7e04d..140e21ac3 100644 --- a/src/observer/sql/operator/table_scan_physical_operator.cpp +++ b/src/observer/sql/operator/table_scan_physical_operator.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table.h" using namespace std; -namespace oceanbase{ +namespace oceanbase { RC TableScanPhysicalOperator::open(Trx *trx) { RC rc = table_->get_record_scanner(record_scanner_, trx, mode_); diff --git a/src/observer/sql/operator/table_scan_physical_operator.h b/src/observer/sql/operator/table_scan_physical_operator.h index 4419ddeb6..34bbe14ea 100644 --- a/src/observer/sql/operator/table_scan_physical_operator.h +++ b/src/observer/sql/operator/table_scan_physical_operator.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record_manager.h" #include "storage/record/record_scanner.h" #include "common/types.h" -namespace oceanbase{ +namespace oceanbase { class Table; /** diff --git a/src/observer/sql/operator/table_scan_vec_physical_operator.cpp b/src/observer/sql/operator/table_scan_vec_physical_operator.cpp index 101e9fe46..f2fde68af 100644 --- a/src/observer/sql/operator/table_scan_vec_physical_operator.cpp +++ b/src/observer/sql/operator/table_scan_vec_physical_operator.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table.h" using namespace std; -namespace oceanbase{ +namespace oceanbase { RC TableScanVecPhysicalOperator::open(Trx *trx) { RC rc = table_->get_chunk_scanner(chunk_scanner_, trx, mode_); diff --git a/src/observer/sql/operator/table_scan_vec_physical_operator.h b/src/observer/sql/operator/table_scan_vec_physical_operator.h index a9e0ac1be..ee8a87aaa 100644 --- a/src/observer/sql/operator/table_scan_vec_physical_operator.h +++ b/src/observer/sql/operator/table_scan_vec_physical_operator.h @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "storage/record/record_manager.h" #include "common/types.h" -namespace oceanbase{ +namespace oceanbase { class Table; /** diff --git a/src/observer/sql/optimizer/cascade/cost_model.cpp b/src/observer/sql/optimizer/cascade/cost_model.cpp index ebe9efe03..7d9fdf51a 100644 --- a/src/observer/sql/optimizer/cascade/cost_model.cpp +++ b/src/observer/sql/optimizer/cascade/cost_model.cpp @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/memo.h" #include "catalog/catalog.h" #include "sql/optimizer/cascade/group_expr.h" -namespace oceanbase{ +namespace oceanbase { double CostModel::calculate_cost(Memo *memo, GroupExpr *gexpr) { diff --git a/src/observer/sql/optimizer/cascade/cost_model.h b/src/observer/sql/optimizer/cascade/cost_model.h index e23055480..9d73eb2cd 100644 --- a/src/observer/sql/optimizer/cascade/cost_model.h +++ b/src/observer/sql/optimizer/cascade/cost_model.h @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #pragma once -namespace oceanbase{ +namespace oceanbase { class Memo; class GroupExpr; /** diff --git a/src/observer/sql/optimizer/cascade/group.cpp b/src/observer/sql/optimizer/cascade/group.cpp index 7343de8cd..8b2fd7864 100644 --- a/src/observer/sql/optimizer/cascade/group.cpp +++ b/src/observer/sql/optimizer/cascade/group.cpp @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/group.h" #include "sql/optimizer/cascade/group_expr.h" #include "sql/optimizer/cascade/memo.h" -namespace oceanbase{ +namespace oceanbase { Group::Group(int id, GroupExpr* expr, Memo *memo) : id_(id), winner_(std::make_tuple(numeric_limits::max(), nullptr)), has_explored_(false) { diff --git a/src/observer/sql/optimizer/cascade/group.h b/src/observer/sql/optimizer/cascade/group.h index 9b04e0db9..5ec7fb323 100644 --- a/src/observer/sql/optimizer/cascade/group.h +++ b/src/observer/sql/optimizer/cascade/group.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "common/lang/unordered_map.h" #include "sql/optimizer/cascade/property_set.h" -namespace oceanbase{ +namespace oceanbase { class GroupExpr; class Memo; /** diff --git a/src/observer/sql/optimizer/cascade/group_expr.cpp b/src/observer/sql/optimizer/cascade/group_expr.cpp index a25b34fcb..4efd79a3c 100644 --- a/src/observer/sql/optimizer/cascade/group_expr.cpp +++ b/src/observer/sql/optimizer/cascade/group_expr.cpp @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/group_expr.h" -namespace oceanbase{ +namespace oceanbase { uint64_t GroupExpr::hash() const { auto hash = contents_->hash(); diff --git a/src/observer/sql/optimizer/cascade/group_expr.h b/src/observer/sql/optimizer/cascade/group_expr.h index e129e7c94..70a5dcd8f 100644 --- a/src/observer/sql/optimizer/cascade/group_expr.h +++ b/src/observer/sql/optimizer/cascade/group_expr.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/operator_node.h" #include "sql/optimizer/cascade/rules.h" #include "sql/optimizer/cascade/property_set.h" -namespace oceanbase{ +namespace oceanbase { // TODO: rename to m_expr(in columbia)? /* GroupExpr used to represent a particular logical or physical * operator expression. diff --git a/src/observer/sql/optimizer/cascade/implementation_rules.cpp b/src/observer/sql/optimizer/cascade/implementation_rules.cpp index 40db18fbc..2e923861f 100644 --- a/src/observer/sql/optimizer/cascade/implementation_rules.cpp +++ b/src/observer/sql/optimizer/cascade/implementation_rules.cpp @@ -27,7 +27,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/group_by_logical_operator.h" #include "sql/operator/scalar_group_by_physical_operator.h" #include "sql/operator/hash_group_by_physical_operator.h" -namespace oceanbase{ +namespace oceanbase { // ------------------------------------------------------------------------------------------------- // PhysicalSeqScan // ------------------------------------------------------------------------------------------------- diff --git a/src/observer/sql/optimizer/cascade/implementation_rules.h b/src/observer/sql/optimizer/cascade/implementation_rules.h index 53c4e43be..4c0c9e0a6 100644 --- a/src/observer/sql/optimizer/cascade/implementation_rules.h +++ b/src/observer/sql/optimizer/cascade/implementation_rules.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/optimizer/cascade/rules.h" -namespace oceanbase{ +namespace oceanbase { /** * Rule transforms Logical Scan -> Physical Scan */ diff --git a/src/observer/sql/optimizer/cascade/memo.cpp b/src/observer/sql/optimizer/cascade/memo.cpp index 5d3e0b39c..ddb3230cc 100644 --- a/src/observer/sql/optimizer/cascade/memo.cpp +++ b/src/observer/sql/optimizer/cascade/memo.cpp @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/memo.h" -namespace oceanbase{ +namespace oceanbase { GroupExpr *Memo::insert_expression(GroupExpr *gexpr, int target_group) { gexpr->set_group_id(target_group); diff --git a/src/observer/sql/optimizer/cascade/memo.h b/src/observer/sql/optimizer/cascade/memo.h index a273047a1..ab8d74d07 100644 --- a/src/observer/sql/optimizer/cascade/memo.h +++ b/src/observer/sql/optimizer/cascade/memo.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "sql/optimizer/cascade/group_expr.h" #include "sql/optimizer/cascade/group.h" -namespace oceanbase{ +namespace oceanbase { const int UNDEFINED_GROUP = -1; /** diff --git a/src/observer/sql/optimizer/cascade/optimizer.cpp b/src/observer/sql/optimizer/cascade/optimizer.cpp index 71e091843..65e9d1dcb 100644 --- a/src/observer/sql/optimizer/cascade/optimizer.cpp +++ b/src/observer/sql/optimizer/cascade/optimizer.cpp @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/optimizer.h" #include "sql/optimizer/cascade/tasks/o_group_task.h" #include "sql/optimizer/cascade/memo.h" -namespace oceanbase{ +namespace oceanbase { std::unique_ptr Optimizer::optimize(OperatorNode* op_tree) { // Generate initial operator tree from query tree diff --git a/src/observer/sql/optimizer/cascade/optimizer.h b/src/observer/sql/optimizer/cascade/optimizer.h index 0be007449..882157e05 100644 --- a/src/observer/sql/optimizer/cascade/optimizer.h +++ b/src/observer/sql/optimizer/cascade/optimizer.h @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/optimizer_context.h" #include "sql/operator/physical_operator.h" #include "sql/optimizer/cascade/property_set.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief cascade optimizer * TODO: currently, Optimizer is used for CBO optimization. need to unify the optimizer in miniob diff --git a/src/observer/sql/optimizer/cascade/optimizer_context.cpp b/src/observer/sql/optimizer/cascade/optimizer_context.cpp index 5275478a6..3b132451b 100644 --- a/src/observer/sql/optimizer/cascade/optimizer_context.cpp +++ b/src/observer/sql/optimizer/cascade/optimizer_context.cpp @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/optimizer_context.h" #include "sql/optimizer/cascade/memo.h" #include "sql/optimizer/cascade/rules.h" -namespace oceanbase{ +namespace oceanbase { OptimizerContext::OptimizerContext() : memo_(new Memo()), rule_set_(new RuleSet()), cost_model_(), task_pool_(nullptr), cost_upper_bound_(std::numeric_limits::max()) {} diff --git a/src/observer/sql/optimizer/cascade/optimizer_context.h b/src/observer/sql/optimizer/cascade/optimizer_context.h index c31cf915b..d924cbc6d 100644 --- a/src/observer/sql/optimizer/cascade/optimizer_context.h +++ b/src/observer/sql/optimizer/cascade/optimizer_context.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/pending_tasks.h" #include "sql/operator/operator_node.h" #include "sql/optimizer/cascade/property_set.h" -namespace oceanbase{ +namespace oceanbase { class Memo; class RuleSet; /** diff --git a/src/observer/sql/optimizer/cascade/pattern.h b/src/observer/sql/optimizer/cascade/pattern.h index d15c11294..9a5573983 100644 --- a/src/observer/sql/optimizer/cascade/pattern.h +++ b/src/observer/sql/optimizer/cascade/pattern.h @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/operator_node.h" #include "common/lang/vector.h" #include "common/lang/memory.h" -namespace oceanbase{ +namespace oceanbase { class Pattern { public: diff --git a/src/observer/sql/optimizer/cascade/pending_tasks.h b/src/observer/sql/optimizer/cascade/pending_tasks.h index 528034616..af406d4e0 100644 --- a/src/observer/sql/optimizer/cascade/pending_tasks.h +++ b/src/observer/sql/optimizer/cascade/pending_tasks.h @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/stack.h" #include "common/log/log.h" #include "sql/optimizer/cascade/tasks/cascade_task.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief This collection of undone cascade tasks is currently stored as a stack. */ diff --git a/src/observer/sql/optimizer/cascade/property.h b/src/observer/sql/optimizer/cascade/property.h index f0acf477d..9b42f3063 100644 --- a/src/observer/sql/optimizer/cascade/property.h +++ b/src/observer/sql/optimizer/cascade/property.h @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #pragma once -namespace oceanbase{ +namespace oceanbase { class Property {}; diff --git a/src/observer/sql/optimizer/cascade/property_set.h b/src/observer/sql/optimizer/cascade/property_set.h index 7560aec28..e5d7ccff2 100644 --- a/src/observer/sql/optimizer/cascade/property_set.h +++ b/src/observer/sql/optimizer/cascade/property_set.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/optimizer/cascade/property.h" -namespace oceanbase{ +namespace oceanbase { class PropertySet; struct PropSetPtrHash { diff --git a/src/observer/sql/optimizer/cascade/rules.cpp b/src/observer/sql/optimizer/cascade/rules.cpp index 70aea4b6b..97c015cd7 100644 --- a/src/observer/sql/optimizer/cascade/rules.cpp +++ b/src/observer/sql/optimizer/cascade/rules.cpp @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/rules.h" #include "sql/optimizer/cascade/implementation_rules.h" #include "sql/optimizer/cascade/group_expr.h" -namespace oceanbase{ +namespace oceanbase { RuleSet::RuleSet() { add_rule(RuleSetName::PHYSICAL_IMPLEMENTATION, new LogicalProjectionToProjection()); diff --git a/src/observer/sql/optimizer/cascade/rules.h b/src/observer/sql/optimizer/cascade/rules.h index 9cc9d93a7..0bf9a559c 100644 --- a/src/observer/sql/optimizer/cascade/rules.h +++ b/src/observer/sql/optimizer/cascade/rules.h @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/unordered_map.h" #include "sql/optimizer/cascade/optimizer_context.h" #include "sql/optimizer/cascade/pattern.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief: Enum defining the types of rules */ diff --git a/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.cpp b/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.cpp index 4a6e17d82..10056df57 100644 --- a/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.cpp @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/group_expr.h" #include "sql/optimizer/cascade/rules.h" #include "common/log/log.h" -namespace oceanbase{ +namespace oceanbase { void ApplyRule::perform() { LOG_TRACE("ApplyRule::perform() for rule: {%d}", rule_->get_rule_idx()); diff --git a/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.h b/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.h index c86528191..dd670f5c0 100644 --- a/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.h @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/tasks/cascade_task.h" #include "sql/optimizer/cascade/rules.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief ApplyRule task */ diff --git a/src/observer/sql/optimizer/cascade/tasks/cascade_task.cpp b/src/observer/sql/optimizer/cascade/tasks/cascade_task.cpp index 7a1a7e6fd..19e2d619d 100644 --- a/src/observer/sql/optimizer/cascade/tasks/cascade_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/cascade_task.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/group_expr.h" #include "sql/optimizer/cascade/rules.h" #include "sql/optimizer/cascade/memo.h" -namespace oceanbase{ +namespace oceanbase { Memo &CascadeTask::get_memo() const {return context_->get_memo(); } RuleSet &CascadeTask::get_rule_set() const { return context_->get_rule_set(); } diff --git a/src/observer/sql/optimizer/cascade/tasks/cascade_task.h b/src/observer/sql/optimizer/cascade/tasks/cascade_task.h index b27f0b668..7ab33042e 100644 --- a/src/observer/sql/optimizer/cascade/tasks/cascade_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/cascade_task.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/lang/vector.h" -namespace oceanbase{ +namespace oceanbase { class Rule; class GroupExpr; class RuleSet; diff --git a/src/observer/sql/optimizer/cascade/tasks/e_group_task.cpp b/src/observer/sql/optimizer/cascade/tasks/e_group_task.cpp index c3c4cf106..e002f5002 100644 --- a/src/observer/sql/optimizer/cascade/tasks/e_group_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/e_group_task.cpp @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/tasks/e_group_task.h" #include "sql/optimizer/cascade/tasks/o_expr_task.h" #include "common/log/log.h" -namespace oceanbase{ +namespace oceanbase { void ExploreGroup::perform() { LOG_TRACE("ExploreGroup::perform() "); diff --git a/src/observer/sql/optimizer/cascade/tasks/e_group_task.h b/src/observer/sql/optimizer/cascade/tasks/e_group_task.h index 6c33f000a..68b3b4ed4 100644 --- a/src/observer/sql/optimizer/cascade/tasks/e_group_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/e_group_task.h @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/tasks/cascade_task.h" #include "sql/optimizer/cascade/group.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief ExploreGroup */ diff --git a/src/observer/sql/optimizer/cascade/tasks/o_expr_task.cpp b/src/observer/sql/optimizer/cascade/tasks/o_expr_task.cpp index 6552b6e24..c0d973a81 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_expr_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/o_expr_task.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/memo.h" #include "common/log/log.h" #include -namespace oceanbase{ +namespace oceanbase { void OptimizeExpression::perform() { std::vector valid_rules; diff --git a/src/observer/sql/optimizer/cascade/tasks/o_expr_task.h b/src/observer/sql/optimizer/cascade/tasks/o_expr_task.h index dd8211acf..83854099d 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_expr_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/o_expr_task.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/optimizer/cascade/tasks/cascade_task.h" -namespace oceanbase{ +namespace oceanbase { /** * OptimizeExpression */ diff --git a/src/observer/sql/optimizer/cascade/tasks/o_group_task.cpp b/src/observer/sql/optimizer/cascade/tasks/o_group_task.cpp index 186a11b07..98150b46b 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_group_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/o_group_task.cpp @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/tasks/o_input_task.h" #include "sql/optimizer/cascade/tasks/o_expr_task.h" #include "sql/optimizer/cascade/optimizer_context.h" -namespace oceanbase{ +namespace oceanbase { void OptimizeGroup::perform() { LOG_TRACE("OptimizeGroup::perform() group %d", group_->get_id()); diff --git a/src/observer/sql/optimizer/cascade/tasks/o_group_task.h b/src/observer/sql/optimizer/cascade/tasks/o_group_task.h index 63b2acea2..37184fe37 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_group_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/o_group_task.h @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/tasks/cascade_task.h" #include "sql/optimizer/cascade/group.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief: OptimizeGroup, find the best plan for a group */ diff --git a/src/observer/sql/optimizer/cascade/tasks/o_input_task.cpp b/src/observer/sql/optimizer/cascade/tasks/o_input_task.cpp index 8f6f8366c..653a0e00c 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_input_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/o_input_task.cpp @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/group_expr.h" #include "sql/optimizer/cascade/memo.h" #include "common/log/log.h" -namespace oceanbase{ +namespace oceanbase { void OptimizeInputs::perform() { LOG_TRACE("OptimizeInputs::perform()"); diff --git a/src/observer/sql/optimizer/cascade/tasks/o_input_task.h b/src/observer/sql/optimizer/cascade/tasks/o_input_task.h index e204f97aa..d0e93bb58 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_input_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/o_input_task.h @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/tasks/cascade_task.h" #include "sql/optimizer/cascade/property_set.h" -namespace oceanbase{ +namespace oceanbase { /** * OptimizeInputs */ diff --git a/src/observer/sql/optimizer/comparison_simplification_rule.cpp b/src/observer/sql/optimizer/comparison_simplification_rule.cpp index bb4cbfa71..34361e0cc 100644 --- a/src/observer/sql/optimizer/comparison_simplification_rule.cpp +++ b/src/observer/sql/optimizer/comparison_simplification_rule.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/comparison_simplification_rule.h" #include "common/log/log.h" #include "sql/expr/expression.h" -namespace oceanbase{ +namespace oceanbase { RC ComparisonSimplificationRule::rewrite(unique_ptr &expr, bool &change_made) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/optimizer/comparison_simplification_rule.h b/src/observer/sql/optimizer/comparison_simplification_rule.h index f8f9c6b08..7378fb9f8 100644 --- a/src/observer/sql/optimizer/comparison_simplification_rule.h +++ b/src/observer/sql/optimizer/comparison_simplification_rule.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/optimizer/rewrite_rule.h" -namespace oceanbase{ +namespace oceanbase { class LogicalOperator; /** diff --git a/src/observer/sql/optimizer/conjunction_simplification_rule.cpp b/src/observer/sql/optimizer/conjunction_simplification_rule.cpp index 309ad63c4..07be951ce 100644 --- a/src/observer/sql/optimizer/conjunction_simplification_rule.cpp +++ b/src/observer/sql/optimizer/conjunction_simplification_rule.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/conjunction_simplification_rule.h" #include "common/log/log.h" #include "sql/expr/expression.h" -namespace oceanbase{ +namespace oceanbase { RC try_to_get_bool_constant(unique_ptr &expr, bool &constant_value) { if (expr->type() == ExprType::VALUE && expr->value_type() == AttrType::BOOLEANS) { diff --git a/src/observer/sql/optimizer/conjunction_simplification_rule.h b/src/observer/sql/optimizer/conjunction_simplification_rule.h index 5b017fc21..0ae9c4100 100644 --- a/src/observer/sql/optimizer/conjunction_simplification_rule.h +++ b/src/observer/sql/optimizer/conjunction_simplification_rule.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/optimizer/rewrite_rule.h" -namespace oceanbase{ +namespace oceanbase { class LogicalOperator; /** diff --git a/src/observer/sql/optimizer/expression_rewriter.cpp b/src/observer/sql/optimizer/expression_rewriter.cpp index 5c54c48da..66c14865d 100644 --- a/src/observer/sql/optimizer/expression_rewriter.cpp +++ b/src/observer/sql/optimizer/expression_rewriter.cpp @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/conjunction_simplification_rule.h" using namespace std; -namespace oceanbase{ +namespace oceanbase { ExpressionRewriter::ExpressionRewriter() { expr_rewrite_rules_.emplace_back(new ComparisonSimplificationRule); diff --git a/src/observer/sql/optimizer/expression_rewriter.h b/src/observer/sql/optimizer/expression_rewriter.h index fbaaf8636..2cf4dada1 100644 --- a/src/observer/sql/optimizer/expression_rewriter.h +++ b/src/observer/sql/optimizer/expression_rewriter.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "sql/operator/logical_operator.h" #include "sql/optimizer/rewrite_rule.h" -namespace oceanbase{ +namespace oceanbase { class ExpressionRewriter : public RewriteRule { public: diff --git a/src/observer/sql/optimizer/logical_plan_generator.cpp b/src/observer/sql/optimizer/logical_plan_generator.cpp index 8690f59b3..43a03da03 100644 --- a/src/observer/sql/optimizer/logical_plan_generator.cpp +++ b/src/observer/sql/optimizer/logical_plan_generator.cpp @@ -39,7 +39,7 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; -namespace oceanbase{ +namespace oceanbase { RC LogicalPlanGenerator::create(Stmt *stmt, unique_ptr &logical_operator) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/optimizer/logical_plan_generator.h b/src/observer/sql/optimizer/logical_plan_generator.h index 66aab52c1..c3318fc12 100644 --- a/src/observer/sql/optimizer/logical_plan_generator.h +++ b/src/observer/sql/optimizer/logical_plan_generator.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/memory.h" #include "common/sys/rc.h" #include "common/type/attr_type.h" -namespace oceanbase{ +namespace oceanbase { class Stmt; class CalcStmt; class SelectStmt; diff --git a/src/observer/sql/optimizer/optimize_stage.cpp b/src/observer/sql/optimizer/optimize_stage.cpp index 53efb7154..59933ac11 100644 --- a/src/observer/sql/optimizer/optimize_stage.cpp +++ b/src/observer/sql/optimizer/optimize_stage.cpp @@ -29,7 +29,7 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; -namespace oceanbase{ +namespace oceanbase { RC OptimizeStage::handle_request(SQLStageEvent *sql_event) { unique_ptr logical_operator; diff --git a/src/observer/sql/optimizer/optimize_stage.h b/src/observer/sql/optimizer/optimize_stage.h index 37fa5708a..bc199be9b 100644 --- a/src/observer/sql/optimizer/optimize_stage.h +++ b/src/observer/sql/optimizer/optimize_stage.h @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/logical_plan_generator.h" #include "sql/optimizer/physical_plan_generator.h" #include "sql/optimizer/rewriter.h" -namespace oceanbase{ +namespace oceanbase { class SQLStageEvent; class LogicalOperator; class Stmt; diff --git a/src/observer/sql/optimizer/optimizer_utils.cpp b/src/observer/sql/optimizer/optimizer_utils.cpp index cafd49bed..39126a05e 100644 --- a/src/observer/sql/optimizer/optimizer_utils.cpp +++ b/src/observer/sql/optimizer/optimizer_utils.cpp @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "sql/optimizer/optimizer_utils.h" -namespace oceanbase{ +namespace oceanbase { string OptimizerUtils::dump_physical_plan(const unique_ptr& children) { std::function &)> to_string = [&]( diff --git a/src/observer/sql/optimizer/optimizer_utils.h b/src/observer/sql/optimizer/optimizer_utils.h index 5cb481f67..8c7427e67 100644 --- a/src/observer/sql/optimizer/optimizer_utils.h +++ b/src/observer/sql/optimizer/optimizer_utils.h @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "common/lang/memory.h" #include "sql/operator/physical_operator.h" -namespace oceanbase{ +namespace oceanbase { class OptimizerUtils { public: diff --git a/src/observer/sql/optimizer/physical_plan_generator.cpp b/src/observer/sql/optimizer/physical_plan_generator.cpp index 3848ce5ba..25c25f1bd 100644 --- a/src/observer/sql/optimizer/physical_plan_generator.cpp +++ b/src/observer/sql/optimizer/physical_plan_generator.cpp @@ -45,7 +45,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/physical_plan_generator.h" using namespace std; -namespace oceanbase{ +namespace oceanbase { RC PhysicalPlanGenerator::create(LogicalOperator &logical_operator, unique_ptr &oper, Session* session) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/optimizer/physical_plan_generator.h b/src/observer/sql/optimizer/physical_plan_generator.h index 146154869..439c38d9d 100644 --- a/src/observer/sql/optimizer/physical_plan_generator.h +++ b/src/observer/sql/optimizer/physical_plan_generator.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/operator/logical_operator.h" #include "sql/operator/physical_operator.h" -namespace oceanbase{ +namespace oceanbase { class Session; class TableGetLogicalOperator; class PredicateLogicalOperator; diff --git a/src/observer/sql/optimizer/predicate_pushdown_rewriter.cpp b/src/observer/sql/optimizer/predicate_pushdown_rewriter.cpp index 5f83a826d..8facd8e51 100644 --- a/src/observer/sql/optimizer/predicate_pushdown_rewriter.cpp +++ b/src/observer/sql/optimizer/predicate_pushdown_rewriter.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "sql/operator/logical_operator.h" #include "sql/operator/table_get_logical_operator.h" -namespace oceanbase{ +namespace oceanbase { RC PredicatePushdownRewriter::rewrite(unique_ptr &oper, bool &change_made) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/optimizer/predicate_pushdown_rewriter.h b/src/observer/sql/optimizer/predicate_pushdown_rewriter.h index b4a6e0535..60e63d9d9 100644 --- a/src/observer/sql/optimizer/predicate_pushdown_rewriter.h +++ b/src/observer/sql/optimizer/predicate_pushdown_rewriter.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/vector.h" #include "sql/optimizer/rewrite_rule.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 将一些谓词表达式下推到表数据扫描中 * @ingroup Rewriter diff --git a/src/observer/sql/optimizer/predicate_rewrite.cpp b/src/observer/sql/optimizer/predicate_rewrite.cpp index 6b4bc1abd..bf834a8f8 100644 --- a/src/observer/sql/optimizer/predicate_rewrite.cpp +++ b/src/observer/sql/optimizer/predicate_rewrite.cpp @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/predicate_rewrite.h" #include "sql/operator/logical_operator.h" -namespace oceanbase{ +namespace oceanbase { RC PredicateRewriteRule::rewrite(unique_ptr &oper, bool &change_made) { vector> &child_opers = oper->children(); diff --git a/src/observer/sql/optimizer/predicate_rewrite.h b/src/observer/sql/optimizer/predicate_rewrite.h index 269dd7e44..af4e3fd60 100644 --- a/src/observer/sql/optimizer/predicate_rewrite.h +++ b/src/observer/sql/optimizer/predicate_rewrite.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/optimizer/rewrite_rule.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 谓词重写规则 * @ingroup Rewriter diff --git a/src/observer/sql/optimizer/predicate_to_join_rule.h b/src/observer/sql/optimizer/predicate_to_join_rule.h index da47d5f52..208bf02e9 100644 --- a/src/observer/sql/optimizer/predicate_to_join_rule.h +++ b/src/observer/sql/optimizer/predicate_to_join_rule.h @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/vector.h" #include "sql/optimizer/rewrite_rule.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 将一些谓词表达式下推到join中 * @ingroup Rewriter diff --git a/src/observer/sql/optimizer/rewrite_rule.h b/src/observer/sql/optimizer/rewrite_rule.h index d2d004608..afae1bcc3 100644 --- a/src/observer/sql/optimizer/rewrite_rule.h +++ b/src/observer/sql/optimizer/rewrite_rule.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "common/lang/memory.h" -namespace oceanbase{ +namespace oceanbase { class LogicalOperator; class Expression; diff --git a/src/observer/sql/optimizer/rewriter.cpp b/src/observer/sql/optimizer/rewriter.cpp index b752611ce..d910da083 100644 --- a/src/observer/sql/optimizer/rewriter.cpp +++ b/src/observer/sql/optimizer/rewriter.cpp @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/expression_rewriter.h" #include "sql/optimizer/predicate_pushdown_rewriter.h" #include "sql/optimizer/predicate_rewrite.h" -namespace oceanbase{ +namespace oceanbase { Rewriter::Rewriter() { rewrite_rules_.emplace_back(new ExpressionRewriter); diff --git a/src/observer/sql/optimizer/rewriter.h b/src/observer/sql/optimizer/rewriter.h index 2a5644421..2ab029f32 100644 --- a/src/observer/sql/optimizer/rewriter.h +++ b/src/observer/sql/optimizer/rewriter.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/rewrite_rule.h" #include "common/lang/memory.h" #include "common/lang/vector.h" -namespace oceanbase{ +namespace oceanbase { class LogicalOperator; /** diff --git a/src/observer/sql/optimizer/statistics/table_statistics.h b/src/observer/sql/optimizer/statistics/table_statistics.h index d1e27e95d..af19f6db4 100644 --- a/src/observer/sql/optimizer/statistics/table_statistics.h +++ b/src/observer/sql/optimizer/statistics/table_statistics.h @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #pragma once -namespace oceanbase{ +namespace oceanbase { class TableStatistics {}; } \ No newline at end of file diff --git a/src/observer/sql/parser/expression_binder.cpp b/src/observer/sql/parser/expression_binder.cpp index 46bd74ba0..97439ee67 100644 --- a/src/observer/sql/parser/expression_binder.cpp +++ b/src/observer/sql/parser/expression_binder.cpp @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression_iterator.h" using namespace common; -namespace oceanbase{ +namespace oceanbase { Table *BinderContext::find_table(const char *table_name) const { auto pred = [table_name](Table *table) { return 0 == strcasecmp(table_name, table->name()); }; diff --git a/src/observer/sql/parser/expression_binder.h b/src/observer/sql/parser/expression_binder.h index ed9572e63..101363e14 100644 --- a/src/observer/sql/parser/expression_binder.h +++ b/src/observer/sql/parser/expression_binder.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/expr/expression.h" -namespace oceanbase{ +namespace oceanbase { class BinderContext { public: diff --git a/src/observer/sql/parser/parse.cpp b/src/observer/sql/parser/parse.cpp index d69b72eed..91f8eb989 100644 --- a/src/observer/sql/parser/parse.cpp +++ b/src/observer/sql/parser/parse.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse.h" #include "common/log/log.h" #include "sql/expr/expression.h" -namespace oceanbase{ +namespace oceanbase { RC parse(char *st, ParsedSqlNode *sqln); ParsedSqlNode::ParsedSqlNode() : flag(SCF_ERROR) {} diff --git a/src/observer/sql/parser/parse.h b/src/observer/sql/parser/parse.h index 5ef636425..1db0a7c76 100644 --- a/src/observer/sql/parser/parse.h +++ b/src/observer/sql/parser/parse.h @@ -16,6 +16,6 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/parser/parse_defs.h" -namespace oceanbase{ +namespace oceanbase { RC parse(const char *st, ParsedSqlResult *sql_result); } \ No newline at end of file diff --git a/src/observer/sql/parser/parse_defs.h b/src/observer/sql/parser/parse_defs.h index 009285b43..83d1480f2 100644 --- a/src/observer/sql/parser/parse_defs.h +++ b/src/observer/sql/parser/parse_defs.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/memory.h" #include "common/value.h" #include "common/lang/utility.h" -namespace oceanbase{ +namespace oceanbase { class Expression; /** diff --git a/src/observer/sql/parser/parse_stage.cpp b/src/observer/sql/parser/parse_stage.cpp index c6757ce5d..c527453b1 100644 --- a/src/observer/sql/parser/parse_stage.cpp +++ b/src/observer/sql/parser/parse_stage.cpp @@ -25,7 +25,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse.h" using namespace common; -namespace oceanbase{ +namespace oceanbase { RC ParseStage::handle_request(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/parser/parse_stage.h b/src/observer/sql/parser/parse_stage.h index 517f2a2e3..09b93440b 100644 --- a/src/observer/sql/parser/parse_stage.h +++ b/src/observer/sql/parser/parse_stage.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" -namespace oceanbase{ +namespace oceanbase { class SQLStageEvent; /** diff --git a/src/observer/sql/parser/resolve_stage.cpp b/src/observer/sql/parser/resolve_stage.cpp index de215c302..0bb0e489c 100644 --- a/src/observer/sql/parser/resolve_stage.cpp +++ b/src/observer/sql/parser/resolve_stage.cpp @@ -26,7 +26,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/stmt.h" using namespace common; -namespace oceanbase{ +namespace oceanbase { RC ResolveStage::handle_request(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/parser/resolve_stage.h b/src/observer/sql/parser/resolve_stage.h index bc33babc2..c33c80415 100644 --- a/src/observer/sql/parser/resolve_stage.h +++ b/src/observer/sql/parser/resolve_stage.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" -namespace oceanbase{ +namespace oceanbase { class SQLStageEvent; /** diff --git a/src/observer/sql/plan_cache/plan_cache_stage.h b/src/observer/sql/plan_cache/plan_cache_stage.h index 7a0bc0275..1efef17ec 100644 --- a/src/observer/sql/plan_cache/plan_cache_stage.h +++ b/src/observer/sql/plan_cache/plan_cache_stage.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 尝试从Plan的缓存中获取Plan，如果没有命中，则执行Optimizer * @ingroup SQLStage diff --git a/src/observer/sql/query_cache/query_cache_stage.cpp b/src/observer/sql/query_cache/query_cache_stage.cpp index 9f342c2e0..4c23ecdb2 100644 --- a/src/observer/sql/query_cache/query_cache_stage.cpp +++ b/src/observer/sql/query_cache/query_cache_stage.cpp @@ -22,7 +22,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" using namespace common; -namespace oceanbase{ +namespace oceanbase { RC QueryCacheStage::handle_request(SQLStageEvent *sql_event) { return RC::SUCCESS; diff --git a/src/observer/sql/query_cache/query_cache_stage.h b/src/observer/sql/query_cache/query_cache_stage.h index 196f03c14..8bb4caac9 100644 --- a/src/observer/sql/query_cache/query_cache_stage.h +++ b/src/observer/sql/query_cache/query_cache_stage.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" -namespace oceanbase{ +namespace oceanbase { class SQLStageEvent; /** diff --git a/src/observer/sql/stmt/analyze_table_stmt.cpp b/src/observer/sql/stmt/analyze_table_stmt.cpp index 6f4c1eb3f..f31cf8326 100644 --- a/src/observer/sql/stmt/analyze_table_stmt.cpp +++ b/src/observer/sql/stmt/analyze_table_stmt.cpp @@ -10,7 +10,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/analyze_table_stmt.h" #include "storage/db/db.h" -namespace oceanbase{ +namespace oceanbase { RC AnalyzeTableStmt::create(Db *db, const AnalyzeTableSqlNode &analyze_table, Stmt *&stmt) { if (db->find_table(analyze_table.relation_name.c_str()) == nullptr) { diff --git a/src/observer/sql/stmt/analyze_table_stmt.h b/src/observer/sql/stmt/analyze_table_stmt.h index c03fec730..ca044f99b 100644 --- a/src/observer/sql/stmt/analyze_table_stmt.h +++ b/src/observer/sql/stmt/analyze_table_stmt.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/stmt/stmt.h" -namespace oceanbase{ +namespace oceanbase { class Db; /** diff --git a/src/observer/sql/stmt/calc_stmt.h b/src/observer/sql/stmt/calc_stmt.h index fbbe53ad1..74ba30296 100644 --- a/src/observer/sql/stmt/calc_stmt.h +++ b/src/observer/sql/stmt/calc_stmt.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/expr/expression.h" #include "sql/stmt/stmt.h" -namespace oceanbase{ +namespace oceanbase { class Db; class Table; diff --git a/src/observer/sql/stmt/create_index_stmt.cpp b/src/observer/sql/stmt/create_index_stmt.cpp index 30efa69f5..a0c764f68 100644 --- a/src/observer/sql/stmt/create_index_stmt.cpp +++ b/src/observer/sql/stmt/create_index_stmt.cpp @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; -namespace oceanbase{ +namespace oceanbase { RC CreateIndexStmt::create(Db *db, const CreateIndexSqlNode &create_index, Stmt *&stmt) { stmt = nullptr; diff --git a/src/observer/sql/stmt/create_index_stmt.h b/src/observer/sql/stmt/create_index_stmt.h index aa385420c..07e38d70d 100644 --- a/src/observer/sql/stmt/create_index_stmt.h +++ b/src/observer/sql/stmt/create_index_stmt.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/stmt/stmt.h" -namespace oceanbase{ +namespace oceanbase { struct CreateIndexSqlNode; class Table; class FieldMeta; diff --git a/src/observer/sql/stmt/create_table_stmt.cpp b/src/observer/sql/stmt/create_table_stmt.cpp index 295239fe9..e8b0bc92e 100644 --- a/src/observer/sql/stmt/create_table_stmt.cpp +++ b/src/observer/sql/stmt/create_table_stmt.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/types.h" #include "sql/stmt/create_table_stmt.h" #include "event/sql_debug.h" -namespace oceanbase{ +namespace oceanbase { RC CreateTableStmt::create(Db *db, const CreateTableSqlNode &create_table, Stmt *&stmt) { StorageFormat storage_format = get_storage_format(create_table.storage_format.c_str()); diff --git a/src/observer/sql/stmt/create_table_stmt.h b/src/observer/sql/stmt/create_table_stmt.h index 4e1df5a25..d3090739e 100644 --- a/src/observer/sql/stmt/create_table_stmt.h +++ b/src/observer/sql/stmt/create_table_stmt.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "common/lang/vector.h" #include "sql/stmt/stmt.h" -namespace oceanbase{ +namespace oceanbase { class Db; /** diff --git a/src/observer/sql/stmt/delete_stmt.cpp b/src/observer/sql/stmt/delete_stmt.cpp index a3689eba5..aca53d261 100644 --- a/src/observer/sql/stmt/delete_stmt.cpp +++ b/src/observer/sql/stmt/delete_stmt.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/filter_stmt.h" #include "storage/db/db.h" #include "storage/table/table.h" -namespace oceanbase{ +namespace oceanbase { DeleteStmt::DeleteStmt(Table *table, FilterStmt *filter_stmt) : table_(table), filter_stmt_(filter_stmt) {} DeleteStmt::~DeleteStmt() diff --git a/src/observer/sql/stmt/delete_stmt.h b/src/observer/sql/stmt/delete_stmt.h index 740827bba..4f86807dd 100644 --- a/src/observer/sql/stmt/delete_stmt.h +++ b/src/observer/sql/stmt/delete_stmt.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse_defs.h" #include "sql/stmt/stmt.h" -namespace oceanbase{ +namespace oceanbase { class Table; class FilterStmt; diff --git a/src/observer/sql/stmt/desc_table_stmt.cpp b/src/observer/sql/stmt/desc_table_stmt.cpp index 12c88fa7a..1cf4b1229 100644 --- a/src/observer/sql/stmt/desc_table_stmt.cpp +++ b/src/observer/sql/stmt/desc_table_stmt.cpp @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/desc_table_stmt.h" #include "storage/db/db.h" -namespace oceanbase{ +namespace oceanbase { RC DescTableStmt::create(Db *db, const DescTableSqlNode &desc_table, Stmt *&stmt) { if (db->find_table(desc_table.relation_name.c_str()) == nullptr) { diff --git a/src/observer/sql/stmt/desc_table_stmt.h b/src/observer/sql/stmt/desc_table_stmt.h index cffdc7c72..3561c0a70 100644 --- a/src/observer/sql/stmt/desc_table_stmt.h +++ b/src/observer/sql/stmt/desc_table_stmt.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/stmt/stmt.h" -namespace oceanbase{ +namespace oceanbase { class Db; /** diff --git a/src/observer/sql/stmt/exit_stmt.h b/src/observer/sql/stmt/exit_stmt.h index a3501b4f6..f69df7951 100644 --- a/src/observer/sql/stmt/exit_stmt.h +++ b/src/observer/sql/stmt/exit_stmt.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/stmt/stmt.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief Exit 语句，表示断开连接，现在什么成员都没有 * @ingroup Statement diff --git a/src/observer/sql/stmt/explain_stmt.cpp b/src/observer/sql/stmt/explain_stmt.cpp index 054a00983..9baad91ca 100644 --- a/src/observer/sql/stmt/explain_stmt.cpp +++ b/src/observer/sql/stmt/explain_stmt.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/explain_stmt.h" #include "common/log/log.h" #include "sql/stmt/stmt.h" -namespace oceanbase{ +namespace oceanbase { ExplainStmt::ExplainStmt(unique_ptr child_stmt) : child_stmt_(std::move(child_stmt)) {} RC ExplainStmt::create(Db *db, const ExplainSqlNode &explain, Stmt *&stmt) diff --git a/src/observer/sql/stmt/explain_stmt.h b/src/observer/sql/stmt/explain_stmt.h index befbf3e24..1d9c21b55 100644 --- a/src/observer/sql/stmt/explain_stmt.h +++ b/src/observer/sql/stmt/explain_stmt.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/stmt/stmt.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief explain语句 * @ingroup Statement diff --git a/src/observer/sql/stmt/filter_stmt.cpp b/src/observer/sql/stmt/filter_stmt.cpp index d267fa495..72c3aeec9 100644 --- a/src/observer/sql/stmt/filter_stmt.cpp +++ b/src/observer/sql/stmt/filter_stmt.cpp @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "storage/db/db.h" #include "storage/table/table.h" -namespace oceanbase{ +namespace oceanbase { FilterStmt::~FilterStmt() { for (FilterUnit *unit : filter_units_) { diff --git a/src/observer/sql/stmt/filter_stmt.h b/src/observer/sql/stmt/filter_stmt.h index fc67a0672..6bc8dadfc 100644 --- a/src/observer/sql/stmt/filter_stmt.h +++ b/src/observer/sql/stmt/filter_stmt.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "sql/parser/parse_defs.h" #include "sql/stmt/stmt.h" -namespace oceanbase{ +namespace oceanbase { class Db; class Table; class FieldMeta; diff --git a/src/observer/sql/stmt/help_stmt.h b/src/observer/sql/stmt/help_stmt.h index f091ab40f..a23dafc09 100644 --- a/src/observer/sql/stmt/help_stmt.h +++ b/src/observer/sql/stmt/help_stmt.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include #include "sql/stmt/stmt.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief Help 语句，现在什么成员都没有 * @ingroup Statement diff --git a/src/observer/sql/stmt/insert_stmt.cpp b/src/observer/sql/stmt/insert_stmt.cpp index c4e56e575..b1f4e1fc5 100644 --- a/src/observer/sql/stmt/insert_stmt.cpp +++ b/src/observer/sql/stmt/insert_stmt.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "storage/db/db.h" #include "storage/table/table.h" -namespace oceanbase{ +namespace oceanbase { InsertStmt::InsertStmt(Table *table, const Value *values, int value_amount) : table_(table), values_(values), value_amount_(value_amount) {} diff --git a/src/observer/sql/stmt/insert_stmt.h b/src/observer/sql/stmt/insert_stmt.h index fc1dd2e46..3dc7f24ed 100644 --- a/src/observer/sql/stmt/insert_stmt.h +++ b/src/observer/sql/stmt/insert_stmt.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/stmt/stmt.h" -namespace oceanbase{ +namespace oceanbase { class Table; class Db; diff --git a/src/observer/sql/stmt/load_data_stmt.cpp b/src/observer/sql/stmt/load_data_stmt.cpp index f14056f2d..9a0b4877c 100644 --- a/src/observer/sql/stmt/load_data_stmt.cpp +++ b/src/observer/sql/stmt/load_data_stmt.cpp @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include using namespace common; -namespace oceanbase{ +namespace oceanbase { RC LoadDataStmt::create(Db *db, const LoadDataSqlNode &load_data, Stmt *&stmt) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/stmt/load_data_stmt.h b/src/observer/sql/stmt/load_data_stmt.h index 4b5e9b921..3b44722ed 100644 --- a/src/observer/sql/stmt/load_data_stmt.h +++ b/src/observer/sql/stmt/load_data_stmt.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/stmt/stmt.h" -namespace oceanbase{ +namespace oceanbase { class Table; class LoadDataStmt : public Stmt diff --git a/src/observer/sql/stmt/select_stmt.cpp b/src/observer/sql/stmt/select_stmt.cpp index 9b9bf83fc..017e25753 100644 --- a/src/observer/sql/stmt/select_stmt.cpp +++ b/src/observer/sql/stmt/select_stmt.cpp @@ -22,7 +22,7 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; -namespace oceanbase{ +namespace oceanbase { SelectStmt::~SelectStmt() { if (nullptr != filter_stmt_) { diff --git a/src/observer/sql/stmt/select_stmt.h b/src/observer/sql/stmt/select_stmt.h index 8b428f87c..c26bc6453 100644 --- a/src/observer/sql/stmt/select_stmt.h +++ b/src/observer/sql/stmt/select_stmt.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/stmt/stmt.h" #include "storage/field/field.h" -namespace oceanbase{ +namespace oceanbase { class FieldMeta; class FilterStmt; class Db; diff --git a/src/observer/sql/stmt/set_variable_stmt.h b/src/observer/sql/stmt/set_variable_stmt.h index abbda7909..19e858846 100644 --- a/src/observer/sql/stmt/set_variable_stmt.h +++ b/src/observer/sql/stmt/set_variable_stmt.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include #include "sql/stmt/stmt.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief SetVairable 语句，设置变量，当前是会话变量，但是只有会话变量，没有全局变量 * @ingroup Statement diff --git a/src/observer/sql/stmt/show_tables_stmt.h b/src/observer/sql/stmt/show_tables_stmt.h index 241d29935..d20b3c64d 100644 --- a/src/observer/sql/stmt/show_tables_stmt.h +++ b/src/observer/sql/stmt/show_tables_stmt.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include #include "sql/stmt/stmt.h" -namespace oceanbase{ +namespace oceanbase { class Db; /** diff --git a/src/observer/sql/stmt/stmt.cpp b/src/observer/sql/stmt/stmt.cpp index 26b1245cc..4cad0c5fa 100644 --- a/src/observer/sql/stmt/stmt.cpp +++ b/src/observer/sql/stmt/stmt.cpp @@ -30,7 +30,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/show_tables_stmt.h" #include "sql/stmt/trx_begin_stmt.h" #include "sql/stmt/trx_end_stmt.h" -namespace oceanbase{ +namespace oceanbase { bool stmt_type_ddl(StmtType type) { switch (type) { diff --git a/src/observer/sql/stmt/stmt.h b/src/observer/sql/stmt/stmt.h index 526c190c3..06842d0f4 100644 --- a/src/observer/sql/stmt/stmt.h +++ b/src/observer/sql/stmt/stmt.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/parser/parse_defs.h" -namespace oceanbase{ +namespace oceanbase { class Db; /** diff --git a/src/observer/sql/stmt/trx_begin_stmt.h b/src/observer/sql/stmt/trx_begin_stmt.h index c5a27e99f..a43ff4d2c 100644 --- a/src/observer/sql/stmt/trx_begin_stmt.h +++ b/src/observer/sql/stmt/trx_begin_stmt.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include #include "sql/stmt/stmt.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 事务的Begin 语句，现在什么成员都没有 * @ingroup Statement diff --git a/src/observer/sql/stmt/trx_end_stmt.h b/src/observer/sql/stmt/trx_end_stmt.h index 9f7000f34..4cc159e18 100644 --- a/src/observer/sql/stmt/trx_end_stmt.h +++ b/src/observer/sql/stmt/trx_end_stmt.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include #include "sql/stmt/stmt.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 事务的 Commit/Rollback 语句，现在什么成员都没有 * @ingroup Statement diff --git a/src/observer/sql/stmt/update_stmt.cpp b/src/observer/sql/stmt/update_stmt.cpp index 93846c350..be1538bc5 100644 --- a/src/observer/sql/stmt/update_stmt.cpp +++ b/src/observer/sql/stmt/update_stmt.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // #include "sql/stmt/update_stmt.h" -namespace oceanbase{ +namespace oceanbase { UpdateStmt::UpdateStmt(Table *table, Value *values, int value_amount) : table_(table), values_(values), value_amount_(value_amount) {} diff --git a/src/observer/sql/stmt/update_stmt.h b/src/observer/sql/stmt/update_stmt.h index bc5b51752..32bad8063 100644 --- a/src/observer/sql/stmt/update_stmt.h +++ b/src/observer/sql/stmt/update_stmt.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/stmt/stmt.h" -namespace oceanbase{ +namespace oceanbase { class Table; /** diff --git a/src/observer/storage/buffer/buffer_pool_log.cpp b/src/observer/storage/buffer/buffer_pool_log.cpp index fc0d3a06f..48db6177c 100644 --- a/src/observer/storage/buffer/buffer_pool_log.cpp +++ b/src/observer/storage/buffer/buffer_pool_log.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/buffer/disk_buffer_pool.h" #include "storage/clog/log_handler.h" #include "storage/clog/log_entry.h" -namespace oceanbase{ +namespace oceanbase { string BufferPoolLogEntry::to_string() const { return string("buffer_pool_id=") + std::to_string(buffer_pool_id) + diff --git a/src/observer/storage/buffer/buffer_pool_log.h b/src/observer/storage/buffer/buffer_pool_log.h index 13a4750de..d006e0d55 100644 --- a/src/observer/storage/buffer/buffer_pool_log.h +++ b/src/observer/storage/buffer/buffer_pool_log.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "common/types.h" #include "common/sys/rc.h" #include "storage/clog/log_replayer.h" -namespace oceanbase{ +namespace oceanbase { class DiskBufferPool; class BufferPoolManager; class LogHandler; diff --git a/src/observer/storage/buffer/disk_buffer_pool.cpp b/src/observer/storage/buffer/disk_buffer_pool.cpp index 7d1d4f0b3..29c2d09ca 100644 --- a/src/observer/storage/buffer/disk_buffer_pool.cpp +++ b/src/observer/storage/buffer/disk_buffer_pool.cpp @@ -24,7 +24,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/db/db.h" using namespace common; -namespace oceanbase{ +namespace oceanbase { static const int MEM_POOL_ITEM_NUM = 20; //////////////////////////////////////////////////////////////////////////////// diff --git a/src/observer/storage/buffer/disk_buffer_pool.h b/src/observer/storage/buffer/disk_buffer_pool.h index bbe81529f..d7f6ffce6 100644 --- a/src/observer/storage/buffer/disk_buffer_pool.h +++ b/src/observer/storage/buffer/disk_buffer_pool.h @@ -36,7 +36,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/buffer/frame.h" #include "storage/buffer/page.h" #include "storage/buffer/buffer_pool_log.h" -namespace oceanbase{ +namespace oceanbase { class BufferPoolManager; class DiskBufferPool; class DoubleWriteBuffer; diff --git a/src/observer/storage/buffer/double_write_buffer.cpp b/src/observer/storage/buffer/double_write_buffer.cpp index 17eda89f2..1dfa38c0e 100644 --- a/src/observer/storage/buffer/double_write_buffer.cpp +++ b/src/observer/storage/buffer/double_write_buffer.cpp @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include using namespace common; -namespace oceanbase{ +namespace oceanbase { struct DoubleWritePage { public: diff --git a/src/observer/storage/buffer/double_write_buffer.h b/src/observer/storage/buffer/double_write_buffer.h index 6ca9fbeb7..facc93315 100644 --- a/src/observer/storage/buffer/double_write_buffer.h +++ b/src/observer/storage/buffer/double_write_buffer.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "common/types.h" #include "common/sys/rc.h" #include "storage/buffer/page.h" -namespace oceanbase{ +namespace oceanbase { class DiskBufferPool; struct DoubleWritePage; class BufferPoolManager; diff --git a/src/observer/storage/buffer/frame.cpp b/src/observer/storage/buffer/frame.cpp index 04267448f..f33b3b617 100644 --- a/src/observer/storage/buffer/frame.cpp +++ b/src/observer/storage/buffer/frame.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/buffer/frame.h" #include "session/session.h" #include "session/thread_data.h" -namespace oceanbase{ +namespace oceanbase { FrameId::FrameId(int buffer_pool_id, PageNum page_num) : buffer_pool_id_(buffer_pool_id), page_num_(page_num) {} bool FrameId::equal_to(const FrameId &other) const diff --git a/src/observer/storage/buffer/frame.h b/src/observer/storage/buffer/frame.h index d5f078f44..bc68f032b 100644 --- a/src/observer/storage/buffer/frame.h +++ b/src/observer/storage/buffer/frame.h @@ -24,7 +24,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "common/types.h" #include "storage/buffer/page.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 页帧标识符 * @ingroup BufferPool diff --git a/src/observer/storage/buffer/page.h b/src/observer/storage/buffer/page.h index e088c957a..92ffcdf7d 100644 --- a/src/observer/storage/buffer/page.h +++ b/src/observer/storage/buffer/page.h @@ -25,7 +25,7 @@ static constexpr PageNum BP_HEADER_PAGE = 0; static constexpr const int BP_PAGE_SIZE = (1 << 13); static constexpr const int BP_PAGE_DATA_SIZE = (BP_PAGE_SIZE - sizeof(LSN) - sizeof(CheckSum)); -namespace oceanbase{ +namespace oceanbase { /** * @brief 表示一个页面，可能放在内存或磁盘上 * @ingroup BufferPool diff --git a/src/observer/storage/clog/disk_log_handler.cpp b/src/observer/storage/clog/disk_log_handler.cpp index 3a7b79625..675785747 100644 --- a/src/observer/storage/clog/disk_log_handler.cpp +++ b/src/observer/storage/clog/disk_log_handler.cpp @@ -22,7 +22,7 @@ using namespace common; //////////////////////////////////////////////////////////////////////////////// // LogHandler -namespace oceanbase{ +namespace oceanbase { RC DiskLogHandler::init(const char *path) { const int max_entry_number_per_file = 1000; diff --git a/src/observer/storage/clog/disk_log_handler.h b/src/observer/storage/clog/disk_log_handler.h index 9d135af71..058cf194c 100644 --- a/src/observer/storage/clog/disk_log_handler.h +++ b/src/observer/storage/clog/disk_log_handler.h @@ -24,7 +24,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/clog/log_file.h" #include "storage/clog/log_buffer.h" #include "storage/clog/log_handler.h" -namespace oceanbase{ +namespace oceanbase { class LogReplayer; /** diff --git a/src/observer/storage/clog/integrated_log_replayer.cpp b/src/observer/storage/clog/integrated_log_replayer.cpp index 3622b2946..68e734c88 100644 --- a/src/observer/storage/clog/integrated_log_replayer.cpp +++ b/src/observer/storage/clog/integrated_log_replayer.cpp @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/clog/integrated_log_replayer.h" #include "storage/clog/log_entry.h" -namespace oceanbase{ +namespace oceanbase { IntegratedLogReplayer::IntegratedLogReplayer(BufferPoolManager &bpm) : buffer_pool_log_replayer_(bpm), record_log_replayer_(bpm), diff --git a/src/observer/storage/clog/integrated_log_replayer.h b/src/observer/storage/clog/integrated_log_replayer.h index 9616c5eb7..aa4ac626d 100644 --- a/src/observer/storage/clog/integrated_log_replayer.h +++ b/src/observer/storage/clog/integrated_log_replayer.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record_log.h" #include "storage/index/bplus_tree_log.h" #include "storage/trx/mvcc_trx_log.h" -namespace oceanbase{ +namespace oceanbase { class BufferPoolManager; /** diff --git a/src/observer/storage/clog/log_buffer.cpp b/src/observer/storage/clog/log_buffer.cpp index 1b250ba87..c83f484b4 100644 --- a/src/observer/storage/clog/log_buffer.cpp +++ b/src/observer/storage/clog/log_buffer.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/chrono.h" using namespace common; -namespace oceanbase{ +namespace oceanbase { RC LogEntryBuffer::init(LSN lsn, int32_t max_bytes /*= 0*/) { current_lsn_.store(lsn); diff --git a/src/observer/storage/clog/log_buffer.h b/src/observer/storage/clog/log_buffer.h index 46963fe6e..ce1ad1fc3 100644 --- a/src/observer/storage/clog/log_buffer.h +++ b/src/observer/storage/clog/log_buffer.h @@ -22,7 +22,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/atomic.h" #include "storage/clog/log_module.h" #include "storage/clog/log_entry.h" -namespace oceanbase{ +namespace oceanbase { class LogFileWriter; /** diff --git a/src/observer/storage/clog/log_entry.cpp b/src/observer/storage/clog/log_entry.cpp index 139d366f9..99bd76270 100644 --- a/src/observer/storage/clog/log_entry.cpp +++ b/src/observer/storage/clog/log_entry.cpp @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/clog/log_entry.h" #include "common/log/log.h" -namespace oceanbase{ +namespace oceanbase { //////////////////////////////////////////////////////////////////////////////// // struct LogHeader diff --git a/src/observer/storage/clog/log_entry.h b/src/observer/storage/clog/log_entry.h index ef5c584e1..30429239b 100644 --- a/src/observer/storage/clog/log_entry.h +++ b/src/observer/storage/clog/log_entry.h @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/vector.h" #include "common/lang/string.h" #include "common/lang/memory.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 描述一条日志头 * @ingroup CLog diff --git a/src/observer/storage/clog/log_file.cpp b/src/observer/storage/clog/log_file.cpp index ee12c18ff..c5f1bff7e 100644 --- a/src/observer/storage/clog/log_file.cpp +++ b/src/observer/storage/clog/log_file.cpp @@ -22,7 +22,7 @@ See the Mulan PSL v2 for more details. */ #include "common/io/io.h" using namespace common; -namespace oceanbase{ +namespace oceanbase { RC LogFileReader::open(const char *filename) { filename_ = filename; diff --git a/src/observer/storage/clog/log_file.h b/src/observer/storage/clog/log_file.h index 412e33f2a..ef285045b 100644 --- a/src/observer/storage/clog/log_file.h +++ b/src/observer/storage/clog/log_file.h @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/filesystem.h" #include "common/lang/fstream.h" #include "common/lang/string.h" -namespace oceanbase{ +namespace oceanbase { class LogEntry; /** diff --git a/src/observer/storage/clog/log_handler.cpp b/src/observer/storage/clog/log_handler.cpp index ae85b582f..7c86195a3 100644 --- a/src/observer/storage/clog/log_handler.cpp +++ b/src/observer/storage/clog/log_handler.cpp @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "storage/clog/disk_log_handler.h" #include "storage/clog/vacuous_log_handler.h" -namespace oceanbase{ +namespace oceanbase { RC LogHandler::append(LSN &lsn, LogModule::Id module, span data) { vector data_vec(data.begin(), data.end()); diff --git a/src/observer/storage/clog/log_handler.h b/src/observer/storage/clog/log_handler.h index 42817174d..bbc118f8a 100644 --- a/src/observer/storage/clog/log_handler.h +++ b/src/observer/storage/clog/log_handler.h @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/span.h" #include "common/lang/vector.h" #include "storage/clog/log_module.h" -namespace oceanbase{ +namespace oceanbase { /** * @defgroup CLog commit log/redo log */ diff --git a/src/observer/storage/clog/log_module.h b/src/observer/storage/clog/log_module.h index 49c3b8c21..b18f6cf0d 100644 --- a/src/observer/storage/clog/log_module.h +++ b/src/observer/storage/clog/log_module.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include -namespace oceanbase{ +namespace oceanbase { /** * @brief 日志模块 * @ingroup CLog diff --git a/src/observer/storage/clog/log_replayer.h b/src/observer/storage/clog/log_replayer.h index 11ca43bad..4474e5a9c 100644 --- a/src/observer/storage/clog/log_replayer.h +++ b/src/observer/storage/clog/log_replayer.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" -namespace oceanbase{ +namespace oceanbase { class LogEntry; /** diff --git a/src/observer/storage/clog/vacuous_log_handler.h b/src/observer/storage/clog/vacuous_log_handler.h index f9811571e..20dacf4d0 100644 --- a/src/observer/storage/clog/vacuous_log_handler.h +++ b/src/observer/storage/clog/vacuous_log_handler.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "storage/clog/log_handler.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief VacuousLogHandler is a log handler implenmentation that do nothing in all methods. * It is used for testing. diff --git a/src/observer/storage/common/arena_allocator.cpp b/src/observer/storage/common/arena_allocator.cpp index d3e8c6a77..4e46f3b72 100644 --- a/src/observer/storage/common/arena_allocator.cpp +++ b/src/observer/storage/common/arena_allocator.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // found in the LICENSE file. See the AUTHORS file for names of contributors. #include "storage/common/arena_allocator.h" -namespace oceanbase{ +namespace oceanbase { static const int kBlockSize = 4096; Arena::Arena() diff --git a/src/observer/storage/common/arena_allocator.h b/src/observer/storage/common/arena_allocator.h index 2cc6ce057..5734d5db6 100644 --- a/src/observer/storage/common/arena_allocator.h +++ b/src/observer/storage/common/arena_allocator.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include #include #include -namespace oceanbase{ +namespace oceanbase { class Arena { public: diff --git a/src/observer/storage/common/chunk.cpp b/src/observer/storage/common/chunk.cpp index 51c0cce8a..ee00cdc6e 100644 --- a/src/observer/storage/common/chunk.cpp +++ b/src/observer/storage/common/chunk.cpp @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "storage/common/chunk.h" -namespace oceanbase{ +namespace oceanbase { void Chunk::add_column(unique_ptr col, int col_id) { columns_.push_back(std::move(col)); diff --git a/src/observer/storage/common/chunk.h b/src/observer/storage/common/chunk.h index 175dfca3a..3658baa65 100644 --- a/src/observer/storage/common/chunk.h +++ b/src/observer/storage/common/chunk.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/memory.h" #include "common/lang/vector.h" #include "storage/common/column.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief A Chunk represents a set of columns. */ diff --git a/src/observer/storage/common/codec.h b/src/observer/storage/common/codec.h index 98be33708..ea137b2f5 100644 --- a/src/observer/storage/common/codec.h +++ b/src/observer/storage/common/codec.h @@ -23,7 +23,7 @@ See the Mulan PSL v2 for more details. */ using byte_t = unsigned char; using bytes = vector; using float64_t = double_t; -namespace oceanbase{ +namespace oceanbase { // reference: https://github.com/code0xff/orderedcodepp class OrderedCode { diff --git a/src/observer/storage/common/column.cpp b/src/observer/storage/common/column.cpp index 2dd3236b6..8c12cc506 100644 --- a/src/observer/storage/common/column.cpp +++ b/src/observer/storage/common/column.cpp @@ -10,7 +10,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "storage/common/column.h" -namespace oceanbase{ +namespace oceanbase { Column::Column(const FieldMeta &meta, size_t size) : data_(nullptr), count_(0), diff --git a/src/observer/storage/common/column.h b/src/observer/storage/common/column.h index f0c51a4ba..dee43925c 100644 --- a/src/observer/storage/common/column.h +++ b/src/observer/storage/common/column.h @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field_meta.h" #include "storage/common/vector_buffer.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief A column contains multiple values in contiguous memory with a specified type. */ diff --git a/src/observer/storage/common/condition_filter.cpp b/src/observer/storage/common/condition_filter.cpp index 70874a59d..ec6a28d37 100644 --- a/src/observer/storage/common/condition_filter.cpp +++ b/src/observer/storage/common/condition_filter.cpp @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include using namespace common; -namespace oceanbase{ +namespace oceanbase { ConditionFilter::~ConditionFilter() {} DefaultConditionFilter::DefaultConditionFilter() diff --git a/src/observer/storage/common/condition_filter.h b/src/observer/storage/common/condition_filter.h index 2e5466874..6f2af7dc2 100644 --- a/src/observer/storage/common/condition_filter.h +++ b/src/observer/storage/common/condition_filter.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/parser/parse.h" -namespace oceanbase{ +namespace oceanbase { class Record; class Table; diff --git a/src/observer/storage/common/meta_util.cpp b/src/observer/storage/common/meta_util.cpp index 388713a27..802db5cdf 100644 --- a/src/observer/storage/common/meta_util.cpp +++ b/src/observer/storage/common/meta_util.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/common/meta_util.h" #include "common/lang/filesystem.h" -namespace oceanbase{ +namespace oceanbase { string db_meta_file(const char *base_dir, const char *db_name) { filesystem::path db_dir = filesystem::path(base_dir); diff --git a/src/observer/storage/common/meta_util.h b/src/observer/storage/common/meta_util.h index 6a1638a32..f54c4d897 100644 --- a/src/observer/storage/common/meta_util.h +++ b/src/observer/storage/common/meta_util.h @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/lang/string.h" -namespace oceanbase{ +namespace oceanbase { static constexpr const char *DB_META_SUFFIX = ".db"; static constexpr const char *TABLE_META_SUFFIX = ".table"; static constexpr const char *TABLE_META_FILE_PATTERN = ".*\\.table$"; diff --git a/src/observer/storage/common/vector_buffer.h b/src/observer/storage/common/vector_buffer.h index 4b773a1e3..b8abaccd8 100644 --- a/src/observer/storage/common/vector_buffer.h +++ b/src/observer/storage/common/vector_buffer.h @@ -3,7 +3,7 @@ #include "storage/common/arena_allocator.h" #include "common/type/string_t.h" #include "common/log/log.h" -namespace oceanbase{ +namespace oceanbase { class VectorBuffer { public: diff --git a/src/observer/storage/db/db.cpp b/src/observer/storage/db/db.cpp index 183779167..f39b5f3db 100644 --- a/src/observer/storage/db/db.cpp +++ b/src/observer/storage/db/db.cpp @@ -29,7 +29,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/clog/integrated_log_replayer.h" using namespace common; -namespace oceanbase{ +namespace oceanbase { Db::~Db() { for (auto &iter : opened_tables_) { diff --git a/src/observer/storage/db/db.h b/src/observer/storage/db/db.h index 928d740cc..02c682aa6 100644 --- a/src/observer/storage/db/db.h +++ b/src/observer/storage/db/db.h @@ -25,7 +25,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/clog/disk_log_handler.h" #include "storage/buffer/double_write_buffer.h" #include "oblsm/include/ob_lsm.h" -namespace oceanbase{ +namespace oceanbase { class Table; class LogHandler; class BufferPoolManager; diff --git a/src/observer/storage/default/default_handler.cpp b/src/observer/storage/default/default_handler.cpp index 1baea3112..68351ed30 100644 --- a/src/observer/storage/default/default_handler.cpp +++ b/src/observer/storage/default/default_handler.cpp @@ -25,7 +25,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/trx/trx.h" using namespace std; -namespace oceanbase{ +namespace oceanbase { DefaultHandler::DefaultHandler() {} DefaultHandler::~DefaultHandler() noexcept { destroy(); } diff --git a/src/observer/storage/default/default_handler.h b/src/observer/storage/default/default_handler.h index f1ced5f3f..249aea258 100644 --- a/src/observer/storage/default/default_handler.h +++ b/src/observer/storage/default/default_handler.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/map.h" #include "common/lang/string.h" #include "common/lang/memory.h" -namespace oceanbase{ +namespace oceanbase { class Trx; class TrxKit; diff --git a/src/observer/storage/field/field.cpp b/src/observer/storage/field/field.cpp index e92119a78..2dade4c95 100644 --- a/src/observer/storage/field/field.cpp +++ b/src/observer/storage/field/field.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "common/value.h" #include "storage/record/record.h" -namespace oceanbase{ +namespace oceanbase { void Field::set_int(Record &record, int value) { ASSERT(field_->type() == AttrType::INTS, "could not set int value to a non-int field"); diff --git a/src/observer/storage/field/field.h b/src/observer/storage/field/field.h index e4b9c5248..18828bc6b 100644 --- a/src/observer/storage/field/field.h +++ b/src/observer/storage/field/field.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field_meta.h" #include "storage/table/table.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 字段 * diff --git a/src/observer/storage/field/field_meta.cpp b/src/observer/storage/field/field_meta.cpp index d0b1c5266..f3c99908b 100644 --- a/src/observer/storage/field/field_meta.cpp +++ b/src/observer/storage/field/field_meta.cpp @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse_defs.h" #include "json/json.h" -namespace oceanbase{ +namespace oceanbase { const static Json::StaticString FIELD_NAME("name"); const static Json::StaticString FIELD_TYPE("type"); const static Json::StaticString FIELD_OFFSET("offset"); diff --git a/src/observer/storage/field/field_meta.h b/src/observer/storage/field/field_meta.h index cde4bf5c0..1a8e6c367 100644 --- a/src/observer/storage/field/field_meta.h +++ b/src/observer/storage/field/field_meta.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "common/lang/string.h" #include "sql/parser/parse_defs.h" -namespace oceanbase{ +namespace oceanbase { namespace Json { class Value; } // namespace Json diff --git a/src/observer/storage/index/bplus_tree.cpp b/src/observer/storage/index/bplus_tree.cpp index 95e2d72b5..9fe4bd190 100644 --- a/src/observer/storage/index/bplus_tree.cpp +++ b/src/observer/storage/index/bplus_tree.cpp @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/buffer/disk_buffer_pool.h" using namespace common; -namespace oceanbase{ +namespace oceanbase { /** * @brief B+树的第一个页面存放的位置 * @details B+树数据放到Buffer Pool中，Buffer Pool把文件按照固定大小的页面拆分。 diff --git a/src/observer/storage/index/bplus_tree.h b/src/observer/storage/index/bplus_tree.h index fb77b1d75..95214f820 100644 --- a/src/observer/storage/index/bplus_tree.h +++ b/src/observer/storage/index/bplus_tree.h @@ -29,7 +29,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record_manager.h" #include "storage/index/latch_memo.h" #include "storage/index/bplus_tree_log.h" -namespace oceanbase{ +namespace oceanbase { class BplusTreeHandler; class BplusTreeMiniTransaction; diff --git a/src/observer/storage/index/bplus_tree_index.cpp b/src/observer/storage/index/bplus_tree_index.cpp index cc9b33ca0..33578c6fb 100644 --- a/src/observer/storage/index/bplus_tree_index.cpp +++ b/src/observer/storage/index/bplus_tree_index.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "storage/table/table.h" #include "storage/db/db.h" -namespace oceanbase{ +namespace oceanbase { BplusTreeIndex::~BplusTreeIndex() noexcept { close(); } RC BplusTreeIndex::create(Table *table, const char *file_name, const IndexMeta &index_meta, const FieldMeta &field_meta) diff --git a/src/observer/storage/index/bplus_tree_index.h b/src/observer/storage/index/bplus_tree_index.h index 679c5fb48..9251104c6 100644 --- a/src/observer/storage/index/bplus_tree_index.h +++ b/src/observer/storage/index/bplus_tree_index.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/index/bplus_tree.h" #include "storage/index/index.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief B+树索引 * @ingroup Index diff --git a/src/observer/storage/index/bplus_tree_log.cpp b/src/observer/storage/index/bplus_tree_log.cpp index ab9b43031..6169818ec 100644 --- a/src/observer/storage/index/bplus_tree_log.cpp +++ b/src/observer/storage/index/bplus_tree_log.cpp @@ -26,7 +26,7 @@ See the Mulan PSL v2 for more details. */ using namespace common; using namespace bplus_tree; -namespace oceanbase{ +namespace oceanbase { /////////////////////////////////////////////////////////////////////////////// // class BplusTreeLogger BplusTreeLogger::BplusTreeLogger(LogHandler &log_handler, int32_t buffer_pool_id) diff --git a/src/observer/storage/index/bplus_tree_log.h b/src/observer/storage/index/bplus_tree_log.h index 9804ebcf5..b25bd5cd2 100644 --- a/src/observer/storage/index/bplus_tree_log.h +++ b/src/observer/storage/index/bplus_tree_log.h @@ -25,7 +25,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/index/latch_memo.h" #include "storage/clog/log_replayer.h" // #include "storage/index/bplus_tree_log_entry.h" -namespace oceanbase{ +namespace oceanbase { struct IndexFileHeader; class LogEntry; class LogHandler; diff --git a/src/observer/storage/index/bplus_tree_log_entry.cpp b/src/observer/storage/index/bplus_tree_log_entry.cpp index 0f767a7bb..f1b75e8f0 100644 --- a/src/observer/storage/index/bplus_tree_log_entry.cpp +++ b/src/observer/storage/index/bplus_tree_log_entry.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/serializer.h" using namespace common; -namespace oceanbase{ +namespace oceanbase { namespace bplus_tree { string LogOperation::to_string() const diff --git a/src/observer/storage/index/bplus_tree_log_entry.h b/src/observer/storage/index/bplus_tree_log_entry.h index ea9d37998..efb5e1c36 100644 --- a/src/observer/storage/index/bplus_tree_log_entry.h +++ b/src/observer/storage/index/bplus_tree_log_entry.h @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/span.h" #include "common/lang/string.h" #include "storage/index/bplus_tree.h" -namespace oceanbase{ +namespace oceanbase { class IndexNodeHandler; class BplusTreeHandler; class BplusTreeMiniTransaction; diff --git a/src/observer/storage/index/index.cpp b/src/observer/storage/index/index.cpp index c446aef79..0c5e05168 100644 --- a/src/observer/storage/index/index.cpp +++ b/src/observer/storage/index/index.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // #include "storage/index/index.h" -namespace oceanbase{ +namespace oceanbase { RC Index::init(const IndexMeta &index_meta, const FieldMeta &field_meta) { index_meta_ = index_meta; diff --git a/src/observer/storage/index/index.h b/src/observer/storage/index/index.h index 413850002..29d300748 100644 --- a/src/observer/storage/index/index.h +++ b/src/observer/storage/index/index.h @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field_meta.h" #include "storage/index/index_meta.h" #include "storage/record/record_manager.h" -namespace oceanbase{ +namespace oceanbase { class IndexScanner; /** diff --git a/src/observer/storage/index/index_meta.cpp b/src/observer/storage/index/index_meta.cpp index f67981b89..d3ea8cc73 100644 --- a/src/observer/storage/index/index_meta.cpp +++ b/src/observer/storage/index/index_meta.cpp @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field_meta.h" #include "storage/table/table_meta.h" #include "json/json.h" -namespace oceanbase{ +namespace oceanbase { const static Json::StaticString FIELD_NAME("name"); const static Json::StaticString FIELD_FIELD_NAME("field_name"); diff --git a/src/observer/storage/index/index_meta.h b/src/observer/storage/index/index_meta.h index 68fdb4b2c..6d62062a3 100644 --- a/src/observer/storage/index/index_meta.h +++ b/src/observer/storage/index/index_meta.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "common/lang/string.h" -namespace oceanbase{ +namespace oceanbase { class TableMeta; class FieldMeta; diff --git a/src/observer/storage/index/ivfflat_index.h b/src/observer/storage/index/ivfflat_index.h index 6246b9eb1..dc3859550 100644 --- a/src/observer/storage/index/ivfflat_index.h +++ b/src/observer/storage/index/ivfflat_index.h @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "storage/index/index.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief ivfflat 向量索引 * @ingroup Index diff --git a/src/observer/storage/index/latch_memo.cpp b/src/observer/storage/index/latch_memo.cpp index c7099c8d1..41404f6e8 100644 --- a/src/observer/storage/index/latch_memo.cpp +++ b/src/observer/storage/index/latch_memo.cpp @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/mutex.h" #include "storage/buffer/disk_buffer_pool.h" #include "storage/buffer/frame.h" -namespace oceanbase{ +namespace oceanbase { LatchMemoItem::LatchMemoItem(LatchMemoType type, Frame *frame) { this->type = type; diff --git a/src/observer/storage/index/latch_memo.h b/src/observer/storage/index/latch_memo.h index fb4ac0975..d8e136138 100644 --- a/src/observer/storage/index/latch_memo.h +++ b/src/observer/storage/index/latch_memo.h @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/deque.h" #include "common/lang/vector.h" #include "storage/buffer/page.h" -namespace oceanbase{ +namespace oceanbase { class Frame; class DiskBufferPool; diff --git a/src/observer/storage/persist/persist.cpp b/src/observer/storage/persist/persist.cpp index d1f423a2f..e35d5730a 100644 --- a/src/observer/storage/persist/persist.cpp +++ b/src/observer/storage/persist/persist.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "persist.h" -namespace oceanbase{ +namespace oceanbase { PersistHandler::PersistHandler() {} PersistHandler::~PersistHandler() { close_file(); } diff --git a/src/observer/storage/persist/persist.h b/src/observer/storage/persist/persist.h index d5399887c..dca07b419 100644 --- a/src/observer/storage/persist/persist.h +++ b/src/observer/storage/persist/persist.h @@ -23,7 +23,7 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "common/lang/string.h" -namespace oceanbase{ +namespace oceanbase { class PersistHandler { public: diff --git a/src/observer/storage/record/heap_record_scanner.cpp b/src/observer/storage/record/heap_record_scanner.cpp index e680ec1f6..6c511aac4 100644 --- a/src/observer/storage/record/heap_record_scanner.cpp +++ b/src/observer/storage/record/heap_record_scanner.cpp @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/heap_record_scanner.h" //////////////////////////////////////////////////////////////////////////////// -namespace oceanbase{ +namespace oceanbase { RC HeapRecordScanner::open_scan() { diff --git a/src/observer/storage/record/heap_record_scanner.h b/src/observer/storage/record/heap_record_scanner.h index 0b9f9372e..769536f90 100644 --- a/src/observer/storage/record/heap_record_scanner.h +++ b/src/observer/storage/record/heap_record_scanner.h @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record_scanner.h" #include "storage/buffer/disk_buffer_pool.h" #include "storage/trx/trx.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 遍历某个文件中所有记录 * @ingroup RecordManager diff --git a/src/observer/storage/record/lob_handler.cpp b/src/observer/storage/record/lob_handler.cpp index 65e5047df..22e897f78 100644 --- a/src/observer/storage/record/lob_handler.cpp +++ b/src/observer/storage/record/lob_handler.cpp @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "storage/record/lob_handler.h" -namespace oceanbase{ +namespace oceanbase { RC LobFileHandler::create_file(const char *file_name) { return file_.create_file(file_name); diff --git a/src/observer/storage/record/lob_handler.h b/src/observer/storage/record/lob_handler.h index 9da8e49b7..baa4128c9 100644 --- a/src/observer/storage/record/lob_handler.h +++ b/src/observer/storage/record/lob_handler.h @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/sstream.h" #include "common/types.h" #include "storage/persist/persist.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 管理LOB文件中的 LOB 对象 * @ingroup RecordManager diff --git a/src/observer/storage/record/lsm_record_scanner.cpp b/src/observer/storage/record/lsm_record_scanner.cpp index af1be499a..11b1b9a42 100644 --- a/src/observer/storage/record/lsm_record_scanner.cpp +++ b/src/observer/storage/record/lsm_record_scanner.cpp @@ -11,7 +11,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/lsm_record_scanner.h" #include "storage/common/codec.h" #include "storage/trx/lsm_mvcc_trx.h" -namespace oceanbase{ +namespace oceanbase { RC LsmRecordScanner::open_scan() { RC rc = RC::SUCCESS; diff --git a/src/observer/storage/record/lsm_record_scanner.h b/src/observer/storage/record/lsm_record_scanner.h index e573ed8c5..c3089117c 100644 --- a/src/observer/storage/record/lsm_record_scanner.h +++ b/src/observer/storage/record/lsm_record_scanner.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/trx/trx.h" using namespace oceanbase; -namespace oceanbase{ +namespace oceanbase { class LsmRecordScanner : public RecordScanner { public: diff --git a/src/observer/storage/record/record.h b/src/observer/storage/record/record.h index 98827b29b..7f5041ff3 100644 --- a/src/observer/storage/record/record.h +++ b/src/observer/storage/record/record.h @@ -24,7 +24,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/limits.h" #include "storage/field/field_meta.h" #include "storage/index/index_meta.h" -namespace oceanbase{ +namespace oceanbase { class Field; /** diff --git a/src/observer/storage/record/record_log.cpp b/src/observer/storage/record/record_log.cpp index 9b9533b17..bc2b7fee7 100644 --- a/src/observer/storage/record/record_log.cpp +++ b/src/observer/storage/record/record_log.cpp @@ -28,7 +28,7 @@ See the Mulan PSL v2 for more details. */ using namespace common; // class RecordOperation -namespace oceanbase{ +namespace oceanbase { string RecordOperation::to_string() const { string ret = std::to_string(type_id()) + ":"; diff --git a/src/observer/storage/record/record_log.h b/src/observer/storage/record/record_log.h index 7450c0beb..333d07ef1 100644 --- a/src/observer/storage/record/record_log.h +++ b/src/observer/storage/record/record_log.h @@ -22,7 +22,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "storage/clog/log_replayer.h" #include "sql/parser/parse_defs.h" -namespace oceanbase{ +namespace oceanbase { struct RID; class LogHandler; class Frame; diff --git a/src/observer/storage/record/record_manager.cpp b/src/observer/storage/record/record_manager.cpp index 4195f28f4..48947504d 100644 --- a/src/observer/storage/record/record_manager.cpp +++ b/src/observer/storage/record/record_manager.cpp @@ -18,7 +18,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/clog/log_handler.h" using namespace common; -namespace oceanbase{ +namespace oceanbase { static constexpr int PAGE_HEADER_SIZE = (sizeof(PageHeader)); RecordPageHandler *RecordPageHandler::create(StorageFormat format) { diff --git a/src/observer/storage/record/record_manager.h b/src/observer/storage/record/record_manager.h index c0bb043c1..2ec0d46fb 100644 --- a/src/observer/storage/record/record_manager.h +++ b/src/observer/storage/record/record_manager.h @@ -22,7 +22,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record_log.h" #include "storage/record/lob_handler.h" #include "common/types.h" -namespace oceanbase{ +namespace oceanbase { class LogHandler; class ConditionFilter; class RecordPageHandler; diff --git a/src/observer/storage/record/record_scanner.h b/src/observer/storage/record/record_scanner.h index 82b46e27d..12c510dda 100644 --- a/src/observer/storage/record/record_scanner.h +++ b/src/observer/storage/record/record_scanner.h @@ -12,7 +12,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record.h" #include "storage/common/condition_filter.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 遍历某个表中所有记录 * @ingroup RecordManager diff --git a/src/observer/storage/table/heap_table_engine.cpp b/src/observer/storage/table/heap_table_engine.cpp index 4e8843ab9..ca2dc0687 100644 --- a/src/observer/storage/table/heap_table_engine.cpp +++ b/src/observer/storage/table/heap_table_engine.cpp @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/common/meta_util.h" #include "storage/db/db.h" -namespace oceanbase{ +namespace oceanbase { HeapTableEngine::~HeapTableEngine() { if (record_handler_ != nullptr) { diff --git a/src/observer/storage/table/heap_table_engine.h b/src/observer/storage/table/heap_table_engine.h index 1921fe262..e4b613e6d 100644 --- a/src/observer/storage/table/heap_table_engine.h +++ b/src/observer/storage/table/heap_table_engine.h @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/index/index.h" #include "storage/record/record_manager.h" #include "storage/db/db.h" -namespace oceanbase{ +namespace oceanbase { class Table; /** * @brief table engine diff --git a/src/observer/storage/table/lsm_table_engine.cpp b/src/observer/storage/table/lsm_table_engine.cpp index 799d19304..ff6b5fecb 100644 --- a/src/observer/storage/table/lsm_table_engine.cpp +++ b/src/observer/storage/table/lsm_table_engine.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/lsm_record_scanner.h" #include "storage/common/codec.h" #include "storage/trx/lsm_mvcc_trx.h" -namespace oceanbase{ +namespace oceanbase { RC LsmTableEngine::insert_record(Record &record) { RC rc = RC::SUCCESS; diff --git a/src/observer/storage/table/lsm_table_engine.h b/src/observer/storage/table/lsm_table_engine.h index 4d4881796..6edc2b32d 100644 --- a/src/observer/storage/table/lsm_table_engine.h +++ b/src/observer/storage/table/lsm_table_engine.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/db/db.h" #include "oblsm/include/ob_lsm.h" using namespace oceanbase; -namespace oceanbase{ +namespace oceanbase { /** * @brief lsm table engine */ diff --git a/src/observer/storage/table/table.cpp b/src/observer/storage/table/table.cpp index d7ff6026a..cc07e8621 100644 --- a/src/observer/storage/table/table.cpp +++ b/src/observer/storage/table/table.cpp @@ -34,7 +34,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/lsm_record_scanner.h" #include "storage/table/heap_table_engine.h" #include "storage/table/lsm_table_engine.h" -namespace oceanbase{ +namespace oceanbase { Table::~Table() { if (lob_handler_ != nullptr) { diff --git a/src/observer/storage/table/table.h b/src/observer/storage/table/table.h index 5fe7a02df..2deffe804 100644 --- a/src/observer/storage/table/table.h +++ b/src/observer/storage/table/table.h @@ -21,7 +21,7 @@ See the Mulan PSL v2 for more details. */ #include "common/types.h" #include "common/lang/span.h" #include "common/lang/functional.h" -namespace oceanbase{ +namespace oceanbase { struct RID; class Record; class DiskBufferPool; diff --git a/src/observer/storage/table/table_engine.h b/src/observer/storage/table/table_engine.h index 47a33b360..bce35217e 100644 --- a/src/observer/storage/table/table_engine.h +++ b/src/observer/storage/table/table_engine.h @@ -14,7 +14,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/functional.h" #include "storage/table/table_meta.h" #include "storage/common/chunk.h" -namespace oceanbase{ +namespace oceanbase { struct RID; class Record; class DiskBufferPool; diff --git a/src/observer/storage/table/table_meta.cpp b/src/observer/storage/table/table_meta.cpp index 91a09c6fa..2d2dcc49d 100644 --- a/src/observer/storage/table/table_meta.cpp +++ b/src/observer/storage/table/table_meta.cpp @@ -19,7 +19,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table_meta.h" #include "storage/trx/trx.h" #include "json/json.h" -namespace oceanbase{ +namespace oceanbase { static const Json::StaticString FIELD_TABLE_ID("table_id"); static const Json::StaticString FIELD_TABLE_NAME("table_name"); static const Json::StaticString FIELD_STORAGE_FORMAT("storage_format"); diff --git a/src/observer/storage/table/table_meta.h b/src/observer/storage/table/table_meta.h index efccfac7d..089b05269 100644 --- a/src/observer/storage/table/table_meta.h +++ b/src/observer/storage/table/table_meta.h @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/span.h" #include "storage/field/field_meta.h" #include "storage/index/index_meta.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief 表元数据 * diff --git a/src/observer/storage/trx/lsm_mvcc_trx.cpp b/src/observer/storage/trx/lsm_mvcc_trx.cpp index d400bc1d8..b270641bc 100644 --- a/src/observer/storage/trx/lsm_mvcc_trx.cpp +++ b/src/observer/storage/trx/lsm_mvcc_trx.cpp @@ -9,7 +9,7 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "storage/trx/lsm_mvcc_trx.h" -namespace oceanbase{ +namespace oceanbase { RC LsmMvccTrxKit::init() { return RC::SUCCESS; } const vector *LsmMvccTrxKit::trx_fields() const { return nullptr; } diff --git a/src/observer/storage/trx/lsm_mvcc_trx.h b/src/observer/storage/trx/lsm_mvcc_trx.h index fc0f40a07..a8efd90c3 100644 --- a/src/observer/storage/trx/lsm_mvcc_trx.h +++ b/src/observer/storage/trx/lsm_mvcc_trx.h @@ -16,7 +16,7 @@ See the Mulan PSL v2 for more details. */ #include "oblsm/include/ob_lsm_transaction.h" using namespace oceanbase; -namespace oceanbase{ +namespace oceanbase { /** * @brief lsm-tree 存储引擎对应的事务管理器 */ diff --git a/src/observer/storage/trx/mvcc_trx.cpp b/src/observer/storage/trx/mvcc_trx.cpp index 8723739c0..204702765 100644 --- a/src/observer/storage/trx/mvcc_trx.cpp +++ b/src/observer/storage/trx/mvcc_trx.cpp @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field.h" #include "storage/trx/mvcc_trx_log.h" #include "common/lang/algorithm.h" -namespace oceanbase{ +namespace oceanbase { MvccTrxKit::~MvccTrxKit() { vector tmp_trxes; diff --git a/src/observer/storage/trx/mvcc_trx.h b/src/observer/storage/trx/mvcc_trx.h index 1331d8b9a..fc14c64ae 100644 --- a/src/observer/storage/trx/mvcc_trx.h +++ b/src/observer/storage/trx/mvcc_trx.h @@ -17,7 +17,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/vector.h" #include "storage/trx/trx.h" #include "storage/trx/mvcc_trx_log.h" -namespace oceanbase{ +namespace oceanbase { class CLogManager; class LogHandler; class MvccTrxLogHandler; diff --git a/src/observer/storage/trx/mvcc_trx_log.cpp b/src/observer/storage/trx/mvcc_trx_log.cpp index f1047178e..59741d669 100644 --- a/src/observer/storage/trx/mvcc_trx_log.cpp +++ b/src/observer/storage/trx/mvcc_trx_log.cpp @@ -22,7 +22,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table.h" using namespace common; -namespace oceanbase{ +namespace oceanbase { string MvccTrxLogOperation::to_string() const { string ret = std::to_string(index()) + ":"; diff --git a/src/observer/storage/trx/mvcc_trx_log.h b/src/observer/storage/trx/mvcc_trx_log.h index efbb641fa..49a5065d3 100644 --- a/src/observer/storage/trx/mvcc_trx_log.h +++ b/src/observer/storage/trx/mvcc_trx_log.h @@ -20,7 +20,7 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/unordered_map.h" #include "storage/record/record.h" #include "storage/clog/log_replayer.h" -namespace oceanbase{ +namespace oceanbase { class LogHandler; class Table; class Db; diff --git a/src/observer/storage/trx/trx.cpp b/src/observer/storage/trx/trx.cpp index 9ffe1872b..20b9310be 100644 --- a/src/observer/storage/trx/trx.cpp +++ b/src/observer/storage/trx/trx.cpp @@ -22,7 +22,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/trx/lsm_mvcc_trx.h" #include "storage/trx/trx.h" #include "storage/trx/vacuous_trx.h" -namespace oceanbase{ +namespace oceanbase { TrxKit *TrxKit::create(const char *name, Db* db) { TrxKit *trx_kit = nullptr; diff --git a/src/observer/storage/trx/trx.h b/src/observer/storage/trx/trx.h index 10620ec82..cdada3d79 100644 --- a/src/observer/storage/trx/trx.h +++ b/src/observer/storage/trx/trx.h @@ -23,7 +23,7 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field_meta.h" #include "storage/record/record_manager.h" #include "storage/table/table.h" -namespace oceanbase{ +namespace oceanbase { /** * @defgroup Transaction * @brief 事务相关的内容 diff --git a/src/observer/storage/trx/vacuous_trx.cpp b/src/observer/storage/trx/vacuous_trx.cpp index 40fd76e18..2c03334a2 100644 --- a/src/observer/storage/trx/vacuous_trx.cpp +++ b/src/observer/storage/trx/vacuous_trx.cpp @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details. */ // #include "storage/trx/vacuous_trx.h" -namespace oceanbase{ +namespace oceanbase { RC VacuousTrxKit::init() { return RC::SUCCESS; } const vector *VacuousTrxKit::trx_fields() const { return nullptr; } diff --git a/src/observer/storage/trx/vacuous_trx.h b/src/observer/storage/trx/vacuous_trx.h index 4b6718569..daf3689bc 100644 --- a/src/observer/storage/trx/vacuous_trx.h +++ b/src/observer/storage/trx/vacuous_trx.h @@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "storage/trx/trx.h" -namespace oceanbase{ +namespace oceanbase { /** * @brief Vacuous(真空的)，顾名思义就是没有实现事务功能 */ From 9ebd4be780e449f152c3e0fdfbb273eb423883fc Mon Sep 17 00:00:00 2001 From: aradhanahegde Date: Fri, 3 Oct 2025 17:40:41 -0400 Subject: [PATCH 3/7] clang format --- src/observer/sql/expr/tuple_cell.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/observer/sql/expr/tuple_cell.h b/src/observer/sql/expr/tuple_cell.h index 3c7b03ba0..483be459b 100644 --- a/src/observer/sql/expr/tuple_cell.h +++ b/src/observer/sql/expr/tuple_cell.h @@ -38,4 +38,4 @@ class TupleCellSpec final string field_name_; string alias_; }; -} \ No newline at end of file +} //namespace oceanbase \ No newline at end of file From b98516f70d7e213a332850d50c199b41e0b404f6 Mon Sep 17 00:00:00 2001 From: aradhanahegde Date: Sun, 5 Oct 2025 15:52:15 -0400 Subject: [PATCH 4/7] clang formatting --- src/observer/storage/table/lsm_table_engine.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/observer/storage/table/lsm_table_engine.cpp b/src/observer/storage/table/lsm_table_engine.cpp index ff6b5fecb..381e75567 100644 --- a/src/observer/storage/table/lsm_table_engine.cpp +++ b/src/observer/storage/table/lsm_table_engine.cpp @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/lsm_record_scanner.h" #include "storage/common/codec.h" #include "storage/trx/lsm_mvcc_trx.h" + namespace oceanbase { + RC LsmTableEngine::insert_record(Record &record) { RC rc = RC::SUCCESS; @@ -43,4 +45,5 @@ RC LsmTableEngine::open() { return RC::UNIMPLEMENTED; } -} \ No newline at end of file + +} // namespace oceanbase \ No newline at end of file From 6dbf4a00a0c3c2829ae5ffaf916fb941428454f5 Mon Sep 17 00:00:00 2001 From: aradhanahegde Date: Sun, 5 Oct 2025 16:02:27 -0400 Subject: [PATCH 5/7] clanf format --- src/observer/catalog/catalog.cpp | 2 ++ src/observer/catalog/catalog.h | 2 ++ src/observer/catalog/table_stats.h | 2 ++ src/observer/common/global_context.cpp | 2 ++ src/observer/common/global_context.h | 2 ++ src/observer/common/ini_setting.h | 2 ++ src/observer/common/init.cpp | 2 ++ src/observer/common/init.h | 2 ++ src/observer/common/type/attr_type.cpp | 2 ++ src/observer/common/type/attr_type.h | 2 ++ src/observer/common/type/char_type.cpp | 2 ++ src/observer/common/type/char_type.h | 2 ++ src/observer/common/type/data_type.cpp | 2 ++ src/observer/common/type/data_type.h | 2 ++ src/observer/common/type/float_type.cpp | 2 ++ src/observer/common/type/float_type.h | 2 ++ src/observer/common/type/integer_type.cpp | 2 ++ src/observer/common/type/integer_type.h | 2 ++ src/observer/common/type/string_t.h | 2 ++ src/observer/common/type/vector_type.h | 2 ++ src/observer/common/types.h | 2 ++ src/observer/common/value.cpp | 2 ++ src/observer/common/value.h | 2 ++ src/observer/event/session_event.cpp | 2 ++ src/observer/event/session_event.h | 2 ++ src/observer/event/sql_debug.cpp | 2 ++ src/observer/event/sql_debug.h | 2 ++ src/observer/event/sql_event.cpp | 2 ++ src/observer/event/sql_event.h | 2 ++ src/observer/event/storage_event.h | 2 ++ src/observer/main.cpp | 3 +++ src/observer/net/buffered_writer.cpp | 2 ++ src/observer/net/buffered_writer.h | 2 ++ src/observer/net/cli_communicator.cpp | 2 ++ src/observer/net/cli_communicator.h | 2 ++ src/observer/net/communicator.cpp | 2 ++ src/observer/net/communicator.h | 2 ++ src/observer/net/java_thread_pool_thread_handler.cpp | 2 ++ src/observer/net/java_thread_pool_thread_handler.h | 2 ++ src/observer/net/mysql_communicator.cpp | 2 ++ src/observer/net/mysql_communicator.h | 2 ++ src/observer/net/one_thread_per_connection_thread_handler.cpp | 2 ++ src/observer/net/one_thread_per_connection_thread_handler.h | 2 ++ src/observer/net/plain_communicator.cpp | 2 ++ src/observer/net/plain_communicator.h | 2 ++ src/observer/net/ring_buffer.cpp | 2 ++ src/observer/net/ring_buffer.h | 2 ++ src/observer/net/server.cpp | 2 ++ src/observer/net/server.h | 2 ++ src/observer/net/server_param.h | 2 ++ src/observer/net/sql_task_handler.cpp | 2 ++ src/observer/net/sql_task_handler.h | 2 ++ src/observer/net/thread_handler.cpp | 2 ++ src/observer/net/thread_handler.h | 2 ++ src/observer/session/session.cpp | 2 ++ src/observer/session/session.h | 2 ++ src/observer/session/session_stage.cpp | 2 ++ src/observer/session/session_stage.h | 2 ++ src/observer/session/thread_data.cpp | 2 ++ src/observer/session/thread_data.h | 2 ++ src/observer/sql/executor/analyze_table_executor.cpp | 2 ++ src/observer/sql/executor/analyze_table_executor.h | 2 ++ src/observer/sql/executor/command_executor.cpp | 2 ++ src/observer/sql/executor/command_executor.h | 2 ++ src/observer/sql/executor/create_index_executor.cpp | 2 ++ src/observer/sql/executor/create_index_executor.h | 2 ++ src/observer/sql/executor/create_table_executor.cpp | 2 ++ src/observer/sql/executor/create_table_executor.h | 2 ++ src/observer/sql/executor/desc_table_executor.cpp | 2 ++ src/observer/sql/executor/desc_table_executor.h | 2 ++ src/observer/sql/executor/execute_stage.cpp | 2 ++ src/observer/sql/executor/execute_stage.h | 2 ++ src/observer/sql/executor/help_executor.h | 2 ++ src/observer/sql/executor/load_data_executor.cpp | 2 ++ src/observer/sql/executor/load_data_executor.h | 2 ++ src/observer/sql/executor/set_variable_executor.cpp | 2 ++ src/observer/sql/executor/set_variable_executor.h | 2 ++ src/observer/sql/executor/show_tables_executor.h | 2 ++ src/observer/sql/executor/sql_result.cpp | 2 ++ src/observer/sql/executor/sql_result.h | 2 ++ src/observer/sql/executor/trx_begin_executor.h | 2 ++ src/observer/sql/executor/trx_end_executor.h | 2 ++ src/observer/sql/expr/aggregate_hash_table.cpp | 2 ++ src/observer/sql/expr/aggregate_hash_table.h | 2 ++ src/observer/sql/expr/aggregate_state.cpp | 2 ++ src/observer/sql/expr/aggregate_state.h | 2 ++ src/observer/sql/expr/aggregator.cpp | 2 ++ src/observer/sql/expr/aggregator.h | 2 ++ src/observer/sql/expr/arithmetic_operator.hpp | 2 ++ src/observer/sql/expr/composite_tuple.cpp | 2 ++ src/observer/sql/expr/composite_tuple.h | 2 ++ src/observer/sql/expr/expression.cpp | 2 ++ src/observer/sql/expr/expression.h | 2 ++ src/observer/sql/expr/expression_iterator.cpp | 2 ++ src/observer/sql/expr/expression_iterator.h | 2 ++ src/observer/sql/expr/expression_tuple.h | 2 ++ src/observer/sql/expr/tuple.h | 2 ++ src/observer/sql/expr/tuple_cell.cpp | 2 ++ src/observer/sql/expr/tuple_cell.h | 2 ++ src/observer/sql/operator/aggregate_vec_physical_operator.cpp | 2 ++ src/observer/sql/operator/aggregate_vec_physical_operator.h | 2 ++ src/observer/sql/operator/calc_logical_operator.h | 2 ++ src/observer/sql/operator/calc_physical_operator.h | 2 ++ src/observer/sql/operator/delete_logical_operator.cpp | 2 ++ src/observer/sql/operator/delete_logical_operator.h | 2 ++ src/observer/sql/operator/delete_physical_operator.cpp | 2 ++ src/observer/sql/operator/delete_physical_operator.h | 2 ++ src/observer/sql/operator/explain_logical_operator.h | 2 ++ src/observer/sql/operator/explain_physical_operator.cpp | 2 ++ src/observer/sql/operator/explain_physical_operator.h | 2 ++ src/observer/sql/operator/expr_vec_physical_operator.cpp | 2 ++ src/observer/sql/operator/expr_vec_physical_operator.h | 2 ++ src/observer/sql/operator/group_by_logical_operator.cpp | 2 ++ src/observer/sql/operator/group_by_logical_operator.h | 2 ++ src/observer/sql/operator/group_by_physical_operator.cpp | 2 ++ src/observer/sql/operator/group_by_physical_operator.h | 2 ++ src/observer/sql/operator/group_by_vec_physical_operator.h | 2 ++ src/observer/sql/operator/hash_group_by_physical_operator.cpp | 2 ++ src/observer/sql/operator/hash_group_by_physical_operator.h | 2 ++ src/observer/sql/operator/hash_join_physical_operator.h | 2 ++ src/observer/sql/operator/index_scan_physical_operator.cpp | 2 ++ src/observer/sql/operator/index_scan_physical_operator.h | 2 ++ src/observer/sql/operator/insert_logical_operator.cpp | 2 ++ src/observer/sql/operator/insert_logical_operator.h | 2 ++ src/observer/sql/operator/insert_physical_operator.cpp | 2 ++ src/observer/sql/operator/insert_physical_operator.h | 2 ++ src/observer/sql/operator/join_logical_operator.h | 2 ++ src/observer/sql/operator/join_physical_operator.cpp | 2 ++ src/observer/sql/operator/join_physical_operator.h | 2 ++ src/observer/sql/operator/logical_operator.cpp | 2 ++ src/observer/sql/operator/logical_operator.h | 2 ++ .../sql/operator/nested_loop_join_physical_operator.cpp | 2 ++ src/observer/sql/operator/nested_loop_join_physical_operator.h | 2 ++ src/observer/sql/operator/operator_node.h | 2 ++ src/observer/sql/operator/physical_operator.cpp | 2 ++ src/observer/sql/operator/physical_operator.h | 2 ++ src/observer/sql/operator/predicate_logical_operator.cpp | 2 ++ src/observer/sql/operator/predicate_logical_operator.h | 2 ++ src/observer/sql/operator/predicate_physical_operator.cpp | 2 ++ src/observer/sql/operator/predicate_physical_operator.h | 2 ++ src/observer/sql/operator/project_logical_operator.cpp | 2 ++ src/observer/sql/operator/project_logical_operator.h | 2 ++ src/observer/sql/operator/project_physical_operator.cpp | 2 ++ src/observer/sql/operator/project_physical_operator.h | 2 ++ src/observer/sql/operator/project_vec_physical_operator.cpp | 2 ++ src/observer/sql/operator/project_vec_physical_operator.h | 2 ++ .../sql/operator/scalar_group_by_physical_operator.cpp | 2 ++ src/observer/sql/operator/scalar_group_by_physical_operator.h | 2 ++ src/observer/sql/operator/string_list_physical_operator.h | 2 ++ src/observer/sql/operator/table_get_logical_operator.cpp | 2 ++ src/observer/sql/operator/table_get_logical_operator.h | 2 ++ src/observer/sql/operator/table_scan_physical_operator.cpp | 2 ++ src/observer/sql/operator/table_scan_physical_operator.h | 2 ++ src/observer/sql/operator/table_scan_vec_physical_operator.cpp | 2 ++ src/observer/sql/operator/table_scan_vec_physical_operator.h | 2 ++ src/observer/sql/optimizer/cascade/cost_model.cpp | 2 ++ src/observer/sql/optimizer/cascade/cost_model.h | 2 ++ src/observer/sql/optimizer/cascade/group.cpp | 2 ++ src/observer/sql/optimizer/cascade/group.h | 2 ++ src/observer/sql/optimizer/cascade/group_expr.cpp | 2 ++ src/observer/sql/optimizer/cascade/group_expr.h | 2 ++ src/observer/sql/optimizer/cascade/implementation_rules.cpp | 2 ++ src/observer/sql/optimizer/cascade/implementation_rules.h | 2 ++ src/observer/sql/optimizer/cascade/memo.cpp | 2 ++ src/observer/sql/optimizer/cascade/memo.h | 2 ++ src/observer/sql/optimizer/cascade/optimizer.cpp | 2 ++ src/observer/sql/optimizer/cascade/optimizer.h | 2 ++ src/observer/sql/optimizer/cascade/optimizer_context.cpp | 2 ++ src/observer/sql/optimizer/cascade/optimizer_context.h | 2 ++ src/observer/sql/optimizer/cascade/pattern.h | 2 ++ src/observer/sql/optimizer/cascade/pending_tasks.h | 2 ++ src/observer/sql/optimizer/cascade/property.h | 2 ++ src/observer/sql/optimizer/cascade/property_set.h | 2 ++ src/observer/sql/optimizer/cascade/rules.cpp | 2 ++ src/observer/sql/optimizer/cascade/rules.h | 2 ++ src/observer/sql/optimizer/cascade/tasks/apply_rule_task.cpp | 2 ++ src/observer/sql/optimizer/cascade/tasks/apply_rule_task.h | 2 ++ src/observer/sql/optimizer/cascade/tasks/cascade_task.cpp | 2 ++ src/observer/sql/optimizer/cascade/tasks/cascade_task.h | 2 ++ src/observer/sql/optimizer/cascade/tasks/e_group_task.cpp | 2 ++ src/observer/sql/optimizer/cascade/tasks/e_group_task.h | 2 ++ src/observer/sql/optimizer/cascade/tasks/o_expr_task.cpp | 2 ++ src/observer/sql/optimizer/cascade/tasks/o_expr_task.h | 2 ++ src/observer/sql/optimizer/cascade/tasks/o_group_task.cpp | 2 ++ src/observer/sql/optimizer/cascade/tasks/o_group_task.h | 2 ++ src/observer/sql/optimizer/cascade/tasks/o_input_task.cpp | 2 ++ src/observer/sql/optimizer/cascade/tasks/o_input_task.h | 2 ++ src/observer/sql/optimizer/comparison_simplification_rule.cpp | 2 ++ src/observer/sql/optimizer/comparison_simplification_rule.h | 2 ++ src/observer/sql/optimizer/conjunction_simplification_rule.cpp | 2 ++ src/observer/sql/optimizer/conjunction_simplification_rule.h | 2 ++ src/observer/sql/optimizer/expression_rewriter.cpp | 2 ++ src/observer/sql/optimizer/expression_rewriter.h | 2 ++ src/observer/sql/optimizer/logical_plan_generator.cpp | 2 ++ src/observer/sql/optimizer/logical_plan_generator.h | 2 ++ src/observer/sql/optimizer/optimize_stage.cpp | 2 ++ src/observer/sql/optimizer/optimize_stage.h | 2 ++ src/observer/sql/optimizer/optimizer_utils.cpp | 2 ++ src/observer/sql/optimizer/optimizer_utils.h | 2 ++ src/observer/sql/optimizer/physical_plan_generator.cpp | 2 ++ src/observer/sql/optimizer/physical_plan_generator.h | 2 ++ src/observer/sql/optimizer/predicate_pushdown_rewriter.cpp | 2 ++ src/observer/sql/optimizer/predicate_pushdown_rewriter.h | 2 ++ src/observer/sql/optimizer/predicate_rewrite.cpp | 2 ++ src/observer/sql/optimizer/predicate_rewrite.h | 2 ++ src/observer/sql/optimizer/predicate_to_join_rule.h | 2 ++ src/observer/sql/optimizer/rewrite_rule.h | 2 ++ src/observer/sql/optimizer/rewriter.cpp | 2 ++ src/observer/sql/optimizer/rewriter.h | 2 ++ src/observer/sql/optimizer/statistics/table_statistics.h | 2 ++ src/observer/sql/parser/expression_binder.cpp | 2 ++ src/observer/sql/parser/expression_binder.h | 2 ++ src/observer/sql/parser/parse.cpp | 2 ++ src/observer/sql/parser/parse.h | 2 ++ src/observer/sql/parser/parse_defs.h | 2 ++ src/observer/sql/parser/parse_stage.cpp | 2 ++ src/observer/sql/parser/parse_stage.h | 2 ++ src/observer/sql/parser/resolve_stage.cpp | 2 ++ src/observer/sql/parser/resolve_stage.h | 2 ++ src/observer/sql/plan_cache/plan_cache_stage.h | 2 ++ src/observer/sql/query_cache/query_cache_stage.cpp | 2 ++ src/observer/sql/query_cache/query_cache_stage.h | 2 ++ src/observer/sql/stmt/analyze_table_stmt.cpp | 2 ++ src/observer/sql/stmt/analyze_table_stmt.h | 2 ++ src/observer/sql/stmt/calc_stmt.h | 2 ++ src/observer/sql/stmt/create_index_stmt.cpp | 2 ++ src/observer/sql/stmt/create_index_stmt.h | 2 ++ src/observer/sql/stmt/create_table_stmt.cpp | 2 ++ src/observer/sql/stmt/create_table_stmt.h | 2 ++ src/observer/sql/stmt/delete_stmt.cpp | 2 ++ src/observer/sql/stmt/delete_stmt.h | 2 ++ src/observer/sql/stmt/desc_table_stmt.cpp | 2 ++ src/observer/sql/stmt/desc_table_stmt.h | 2 ++ src/observer/sql/stmt/exit_stmt.h | 2 ++ src/observer/sql/stmt/explain_stmt.cpp | 2 ++ src/observer/sql/stmt/explain_stmt.h | 2 ++ src/observer/sql/stmt/filter_stmt.cpp | 2 ++ src/observer/sql/stmt/filter_stmt.h | 2 ++ src/observer/sql/stmt/help_stmt.h | 2 ++ src/observer/sql/stmt/insert_stmt.cpp | 2 ++ src/observer/sql/stmt/insert_stmt.h | 2 ++ src/observer/sql/stmt/load_data_stmt.cpp | 2 ++ src/observer/sql/stmt/load_data_stmt.h | 2 ++ src/observer/sql/stmt/select_stmt.cpp | 2 ++ src/observer/sql/stmt/select_stmt.h | 2 ++ src/observer/sql/stmt/set_variable_stmt.h | 2 ++ src/observer/sql/stmt/show_tables_stmt.h | 2 ++ src/observer/sql/stmt/stmt.cpp | 2 ++ src/observer/sql/stmt/stmt.h | 2 ++ src/observer/sql/stmt/trx_begin_stmt.h | 2 ++ src/observer/sql/stmt/trx_end_stmt.h | 2 ++ src/observer/sql/stmt/update_stmt.cpp | 2 ++ src/observer/sql/stmt/update_stmt.h | 2 ++ src/observer/storage/buffer/buffer_pool_log.cpp | 2 ++ src/observer/storage/buffer/buffer_pool_log.h | 2 ++ src/observer/storage/buffer/disk_buffer_pool.cpp | 2 ++ src/observer/storage/buffer/disk_buffer_pool.h | 2 ++ src/observer/storage/buffer/double_write_buffer.cpp | 2 ++ src/observer/storage/buffer/double_write_buffer.h | 2 ++ src/observer/storage/buffer/frame.cpp | 2 ++ src/observer/storage/buffer/frame.h | 2 ++ src/observer/storage/buffer/page.h | 2 ++ src/observer/storage/clog/disk_log_handler.cpp | 2 ++ src/observer/storage/clog/disk_log_handler.h | 2 ++ src/observer/storage/clog/integrated_log_replayer.cpp | 2 ++ src/observer/storage/clog/integrated_log_replayer.h | 2 ++ src/observer/storage/clog/log_buffer.cpp | 2 ++ src/observer/storage/clog/log_buffer.h | 2 ++ src/observer/storage/clog/log_entry.cpp | 2 ++ src/observer/storage/clog/log_entry.h | 2 ++ src/observer/storage/clog/log_file.cpp | 2 ++ src/observer/storage/clog/log_file.h | 2 ++ src/observer/storage/clog/log_handler.cpp | 2 ++ src/observer/storage/clog/log_handler.h | 2 ++ src/observer/storage/clog/log_module.h | 2 ++ src/observer/storage/clog/log_replayer.h | 2 ++ src/observer/storage/clog/vacuous_log_handler.h | 2 ++ src/observer/storage/common/arena_allocator.cpp | 2 ++ src/observer/storage/common/arena_allocator.h | 2 ++ src/observer/storage/common/chunk.cpp | 2 ++ src/observer/storage/common/chunk.h | 2 ++ src/observer/storage/common/codec.h | 2 ++ src/observer/storage/common/column.cpp | 2 ++ src/observer/storage/common/column.h | 2 ++ src/observer/storage/common/condition_filter.cpp | 2 ++ src/observer/storage/common/condition_filter.h | 2 ++ src/observer/storage/common/meta_util.cpp | 2 ++ src/observer/storage/common/meta_util.h | 2 ++ src/observer/storage/common/vector_buffer.h | 2 ++ src/observer/storage/db/db.cpp | 2 ++ src/observer/storage/db/db.h | 2 ++ src/observer/storage/default/default_handler.cpp | 2 ++ src/observer/storage/default/default_handler.h | 2 ++ src/observer/storage/field/field.cpp | 2 ++ src/observer/storage/field/field.h | 2 ++ src/observer/storage/field/field_meta.cpp | 2 ++ src/observer/storage/field/field_meta.h | 2 ++ src/observer/storage/index/bplus_tree.cpp | 2 ++ src/observer/storage/index/bplus_tree.h | 2 ++ src/observer/storage/index/bplus_tree_index.cpp | 2 ++ src/observer/storage/index/bplus_tree_index.h | 2 ++ src/observer/storage/index/bplus_tree_log.cpp | 2 ++ src/observer/storage/index/bplus_tree_log.h | 2 ++ src/observer/storage/index/bplus_tree_log_entry.cpp | 2 ++ src/observer/storage/index/bplus_tree_log_entry.h | 2 ++ src/observer/storage/index/index.cpp | 2 ++ src/observer/storage/index/index.h | 2 ++ src/observer/storage/index/index_meta.cpp | 2 ++ src/observer/storage/index/index_meta.h | 2 ++ src/observer/storage/index/ivfflat_index.h | 2 ++ src/observer/storage/index/latch_memo.cpp | 2 ++ src/observer/storage/index/latch_memo.h | 2 ++ src/observer/storage/persist/persist.cpp | 2 ++ src/observer/storage/persist/persist.h | 2 ++ src/observer/storage/record/heap_record_scanner.cpp | 2 ++ src/observer/storage/record/heap_record_scanner.h | 2 ++ src/observer/storage/record/lob_handler.cpp | 2 ++ src/observer/storage/record/lob_handler.h | 2 ++ src/observer/storage/record/lsm_record_scanner.cpp | 2 ++ src/observer/storage/record/lsm_record_scanner.h | 2 ++ src/observer/storage/record/record.h | 2 ++ src/observer/storage/record/record_log.cpp | 2 ++ src/observer/storage/record/record_log.h | 2 ++ src/observer/storage/record/record_manager.cpp | 2 ++ src/observer/storage/record/record_manager.h | 2 ++ src/observer/storage/record/record_scanner.h | 2 ++ src/observer/storage/table/heap_table_engine.cpp | 2 ++ src/observer/storage/table/heap_table_engine.h | 2 ++ src/observer/storage/table/lsm_table_engine.cpp | 2 ++ src/observer/storage/table/lsm_table_engine.h | 2 ++ src/observer/storage/table/table.cpp | 2 ++ src/observer/storage/table/table.h | 2 ++ src/observer/storage/table/table_engine.h | 2 ++ src/observer/storage/table/table_meta.cpp | 2 ++ src/observer/storage/table/table_meta.h | 2 ++ src/observer/storage/trx/lsm_mvcc_trx.cpp | 2 ++ src/observer/storage/trx/lsm_mvcc_trx.h | 2 ++ src/observer/storage/trx/mvcc_trx.cpp | 2 ++ src/observer/storage/trx/mvcc_trx.h | 2 ++ src/observer/storage/trx/mvcc_trx_log.cpp | 2 ++ src/observer/storage/trx/mvcc_trx_log.h | 2 ++ src/observer/storage/trx/trx.cpp | 2 ++ src/observer/storage/trx/trx.h | 2 ++ src/observer/storage/trx/vacuous_trx.cpp | 2 ++ src/observer/storage/trx/vacuous_trx.h | 2 ++ 345 files changed, 691 insertions(+) diff --git a/src/observer/catalog/catalog.cpp b/src/observer/catalog/catalog.cpp index 95d34c690..0802ac2e6 100644 --- a/src/observer/catalog/catalog.cpp +++ b/src/observer/catalog/catalog.cpp @@ -9,7 +9,9 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "catalog/catalog.h" + namespace oceanbase { + const TableStats &Catalog::get_table_stats(int table_id) { lock_guard lock(mutex_); diff --git a/src/observer/catalog/catalog.h b/src/observer/catalog/catalog.h index 3f61d517d..60f8d3712 100644 --- a/src/observer/catalog/catalog.h +++ b/src/observer/catalog/catalog.h @@ -12,7 +12,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/unordered_map.h" #include "common/lang/mutex.h" #include "catalog/table_stats.h" + namespace oceanbase { + /** * @class Catalog * @brief Store metadata, such as table statistics. diff --git a/src/observer/catalog/table_stats.h b/src/observer/catalog/table_stats.h index c0a61f875..dc410e32d 100644 --- a/src/observer/catalog/table_stats.h +++ b/src/observer/catalog/table_stats.h @@ -9,7 +9,9 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #pragma once + namespace oceanbase { + /** * @class TableStats * @brief Represents statistics related to a table. diff --git a/src/observer/common/global_context.cpp b/src/observer/common/global_context.cpp index 2bddd3cad..9a3cb2d12 100644 --- a/src/observer/common/global_context.cpp +++ b/src/observer/common/global_context.cpp @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ // #include "common/global_context.h" + namespace oceanbase { + static GlobalContext global_context; GlobalContext &GlobalContext::instance() { return global_context; } diff --git a/src/observer/common/global_context.h b/src/observer/common/global_context.h index 1855a3c9d..96f50a364 100644 --- a/src/observer/common/global_context.h +++ b/src/observer/common/global_context.h @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ // #pragma once + namespace oceanbase { + class BufferPoolManager; class DefaultHandler; class TrxKit; diff --git a/src/observer/common/ini_setting.h b/src/observer/common/ini_setting.h index 933d475bc..a78a9bf10 100644 --- a/src/observer/common/ini_setting.h +++ b/src/observer/common/ini_setting.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once //! this document is used for ini setting + namespace oceanbase { + #define CLIENT_ADDRESS "CLIENT_ADDRESS" #define MAX_CONNECTION_NUM "MAX_CONNECTION_NUM" #define MAX_CONNECTION_NUM_DEFAULT 8192 diff --git a/src/observer/common/init.cpp b/src/observer/common/init.cpp index da6910949..aeb4aafb2 100644 --- a/src/observer/common/init.cpp +++ b/src/observer/common/init.cpp @@ -31,7 +31,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/trx/trx.h" using namespace common; + namespace oceanbase { + bool *&_get_init() { static bool util_init = false; diff --git a/src/observer/common/init.h b/src/observer/common/init.h index d092a6a0d..a15341b96 100644 --- a/src/observer/common/init.h +++ b/src/observer/common/init.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/conf/ini.h" #include "common/os/process_param.h" + namespace oceanbase { + int init(common::ProcessParam *processParam); void cleanup(); } \ No newline at end of file diff --git a/src/observer/common/type/attr_type.cpp b/src/observer/common/type/attr_type.cpp index e6230b030..7c526d063 100644 --- a/src/observer/common/type/attr_type.cpp +++ b/src/observer/common/type/attr_type.cpp @@ -11,7 +11,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "common/type/attr_type.h" + namespace oceanbase { + const char *ATTR_TYPE_NAME[] = {"undefined", "chars", "ints", "floats", "vectors", "booleans"}; const char *attr_type_to_string(AttrType type) diff --git a/src/observer/common/type/attr_type.h b/src/observer/common/type/attr_type.h index c9f90bd2f..dcf488b35 100644 --- a/src/observer/common/type/attr_type.h +++ b/src/observer/common/type/attr_type.h @@ -9,7 +9,9 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #pragma once + namespace oceanbase { + /** * @brief 属性的类型 * @details AttrType 枚举列出了属性的各种数据类型。 diff --git a/src/observer/common/type/char_type.cpp b/src/observer/common/type/char_type.cpp index 7e1d1f6e3..57ec67d47 100644 --- a/src/observer/common/type/char_type.cpp +++ b/src/observer/common/type/char_type.cpp @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ #include "common/type/char_type.h" #include "common/value.h" + namespace oceanbase { + int CharType::compare(const Value &left, const Value &right) const { ASSERT(left.attr_type() == AttrType::CHARS && right.attr_type() == AttrType::CHARS, "invalid type"); diff --git a/src/observer/common/type/char_type.h b/src/observer/common/type/char_type.h index a44446a6b..ecdbb09da 100644 --- a/src/observer/common/type/char_type.h +++ b/src/observer/common/type/char_type.h @@ -12,7 +12,9 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "common/type/data_type.h" + namespace oceanbase { + /** * @brief 固定长度的字符串类型 * @ingroup DataType diff --git a/src/observer/common/type/data_type.cpp b/src/observer/common/type/data_type.cpp index 156d43342..c0d945ed2 100644 --- a/src/observer/common/type/data_type.cpp +++ b/src/observer/common/type/data_type.cpp @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ #include "common/type/integer_type.h" #include "common/type/data_type.h" #include "common/type/vector_type.h" + namespace oceanbase { + // Todo: 实现新数据类型 // your code here diff --git a/src/observer/common/type/data_type.h b/src/observer/common/type/data_type.h index 150dcd102..2f02d5e82 100644 --- a/src/observer/common/type/data_type.h +++ b/src/observer/common/type/data_type.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "common/sys/rc.h" #include "common/type/attr_type.h" + namespace oceanbase { + class Value; class Column; diff --git a/src/observer/common/type/float_type.cpp b/src/observer/common/type/float_type.cpp index 40e35ce1a..ddbb81b9f 100644 --- a/src/observer/common/type/float_type.cpp +++ b/src/observer/common/type/float_type.cpp @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "common/value.h" #include "storage/common/column.h" + namespace oceanbase { + int FloatType::compare(const Value &left, const Value &right) const { ASSERT(left.attr_type() == AttrType::FLOATS, "left type is not float"); diff --git a/src/observer/common/type/float_type.h b/src/observer/common/type/float_type.h index 610483704..e3ddbf7a9 100644 --- a/src/observer/common/type/float_type.h +++ b/src/observer/common/type/float_type.h @@ -11,7 +11,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/type/data_type.h" + namespace oceanbase { + /** * @brief 浮点型数据类型 * @ingroup DataType diff --git a/src/observer/common/type/integer_type.cpp b/src/observer/common/type/integer_type.cpp index 97a7f8452..a01fdff6b 100644 --- a/src/observer/common/type/integer_type.cpp +++ b/src/observer/common/type/integer_type.cpp @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #include "common/value.h" #include "storage/common/column.h" + namespace oceanbase { + int IntegerType::compare(const Value &left, const Value &right) const { ASSERT(left.attr_type() == AttrType::INTS, "left type is not integer"); diff --git a/src/observer/common/type/integer_type.h b/src/observer/common/type/integer_type.h index 5be22c505..8f1755368 100644 --- a/src/observer/common/type/integer_type.h +++ b/src/observer/common/type/integer_type.h @@ -11,7 +11,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/type/data_type.h" + namespace oceanbase { + /** * @brief 整型类型 * @ingroup DataType diff --git a/src/observer/common/type/string_t.h b/src/observer/common/type/string_t.h index 647cc1970..99518af8d 100644 --- a/src/observer/common/type/string_t.h +++ b/src/observer/common/type/string_t.h @@ -14,7 +14,9 @@ See the Mulan PSL v2 for more details. */ #include using namespace std; + namespace oceanbase { + struct string_t { public: diff --git a/src/observer/common/type/vector_type.h b/src/observer/common/type/vector_type.h index 4dbf75e37..b9b06c526 100644 --- a/src/observer/common/type/vector_type.h +++ b/src/observer/common/type/vector_type.h @@ -11,7 +11,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/type/data_type.h" + namespace oceanbase { + /** * @brief 向量类型 * @ingroup DataType diff --git a/src/observer/common/types.h b/src/observer/common/types.h index fde3bb011..5ea1a3d65 100644 --- a/src/observer/common/types.h +++ b/src/observer/common/types.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include #include + namespace oceanbase { + /// 磁盘文件，包括存放数据的文件和索引(B+-Tree)文件，都按照页来组织 /// 每一页都有一个编号，称为PageNum using PageNum = int32_t; diff --git a/src/observer/common/value.cpp b/src/observer/common/value.cpp index b2f4a645e..4406cc50e 100644 --- a/src/observer/common/value.cpp +++ b/src/observer/common/value.cpp @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/sstream.h" #include "common/lang/string.h" #include "common/log/log.h" + namespace oceanbase { + Value::Value(int val) { set_int(val); } Value::Value(float val) { set_float(val); } diff --git a/src/observer/common/value.h b/src/observer/common/value.h index bc58a1707..e6f30e090 100644 --- a/src/observer/common/value.h +++ b/src/observer/common/value.h @@ -20,7 +20,9 @@ See the Mulan PSL v2 for more details. */ #include "common/type/data_type.h" #include "common/type/string_t.h" + namespace oceanbase { + /** * @brief 属性的值 * @ingroup DataType diff --git a/src/observer/event/session_event.cpp b/src/observer/event/session_event.cpp index 76f97dcfc..4fda87bbc 100644 --- a/src/observer/event/session_event.cpp +++ b/src/observer/event/session_event.cpp @@ -14,7 +14,9 @@ See the Mulan PSL v2 for more details. */ #include "session_event.h" #include "net/communicator.h" + namespace oceanbase { + SessionEvent::SessionEvent(Communicator *comm) : communicator_(comm), sql_result_(communicator_->session()) {} SessionEvent::~SessionEvent() {} diff --git a/src/observer/event/session_event.h b/src/observer/event/session_event.h index 7fe088d91..efe27f10c 100644 --- a/src/observer/event/session_event.h +++ b/src/observer/event/session_event.h @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "event/sql_debug.h" #include "sql/executor/sql_result.h" + namespace oceanbase { + class Session; class Communicator; diff --git a/src/observer/event/sql_debug.cpp b/src/observer/event/sql_debug.cpp index 8300e3032..2ec9dfcab 100644 --- a/src/observer/event/sql_debug.cpp +++ b/src/observer/event/sql_debug.cpp @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include "event/sql_debug.h" #include "session/session.h" + namespace oceanbase { + void SqlDebug::add_debug_info(const string &debug_info) { debug_infos_.push_back(debug_info); } void SqlDebug::clear_debug_info() { debug_infos_.clear(); } diff --git a/src/observer/event/sql_debug.h b/src/observer/event/sql_debug.h index 3b58f0980..bbd5d5083 100644 --- a/src/observer/event/sql_debug.h +++ b/src/observer/event/sql_debug.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "common/lang/list.h" + namespace oceanbase { + /** * @brief SQL调试信息 * @details diff --git a/src/observer/event/sql_event.cpp b/src/observer/event/sql_event.cpp index 5e798e509..2506a57d9 100644 --- a/src/observer/event/sql_event.cpp +++ b/src/observer/event/sql_event.cpp @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "event/session_event.h" #include "sql/stmt/stmt.h" + namespace oceanbase { + SQLStageEvent::SQLStageEvent(SessionEvent *event, const string &sql) : session_event_(event), sql_(sql) {} SQLStageEvent::~SQLStageEvent() noexcept diff --git a/src/observer/event/sql_event.h b/src/observer/event/sql_event.h index 4eb1f64e7..0c34ac5b2 100644 --- a/src/observer/event/sql_event.h +++ b/src/observer/event/sql_event.h @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "common/lang/memory.h" #include "sql/operator/physical_operator.h" + namespace oceanbase { + class SessionEvent; class Stmt; class ParsedSqlNode; diff --git a/src/observer/event/storage_event.h b/src/observer/event/storage_event.h index a60a94cd7..c7cc31473 100644 --- a/src/observer/event/storage_event.h +++ b/src/observer/event/storage_event.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/seda/stage_event.h" + namespace oceanbase { + class SQLStageEvent; class StorageEvent : public common::StageEvent diff --git a/src/observer/main.cpp b/src/observer/main.cpp index a61644680..c83532d4c 100644 --- a/src/observer/main.cpp +++ b/src/observer/main.cpp @@ -32,7 +32,9 @@ See the Mulan PSL v2 for more details. */ using namespace common; #define NET "NET" + namespace oceanbase { + static Server *g_server = nullptr; @@ -208,4 +210,5 @@ int main(int argc, char **argv) delete g_server; return 0; } + } \ No newline at end of file diff --git a/src/observer/net/buffered_writer.cpp b/src/observer/net/buffered_writer.cpp index 66c1708d7..e7e76e300 100644 --- a/src/observer/net/buffered_writer.cpp +++ b/src/observer/net/buffered_writer.cpp @@ -20,7 +20,9 @@ See the Mulan PSL v2 for more details. */ #include #include "net/buffered_writer.h" + namespace oceanbase { + BufferedWriter::BufferedWriter(int fd) : fd_(fd), buffer_() {} BufferedWriter::BufferedWriter(int fd, int32_t size) : fd_(fd), buffer_(size) {} diff --git a/src/observer/net/buffered_writer.h b/src/observer/net/buffered_writer.h index c88badec6..34cbc6ece 100644 --- a/src/observer/net/buffered_writer.h +++ b/src/observer/net/buffered_writer.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "net/ring_buffer.h" + namespace oceanbase { + /** * @brief 支持以缓存模式写入数据到文件/socket * @details 缓存使用ring buffer实现，当缓存满时会自动刷新缓存。 diff --git a/src/observer/net/cli_communicator.cpp b/src/observer/net/cli_communicator.cpp index 7d45fae82..52660cc88 100644 --- a/src/observer/net/cli_communicator.cpp +++ b/src/observer/net/cli_communicator.cpp @@ -26,7 +26,9 @@ See the Mulan PSL v2 for more details. */ using common::MiniobLineReader; const std::string LINE_HISTORY_FILE = "./.miniob.history"; + namespace oceanbase { + RC CliCommunicator::init(int fd, unique_ptr session, const string &addr) { RC rc = PlainCommunicator::init(fd, std::move(session), addr); diff --git a/src/observer/net/cli_communicator.h b/src/observer/net/cli_communicator.h index a4d13f248..750962250 100644 --- a/src/observer/net/cli_communicator.h +++ b/src/observer/net/cli_communicator.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "net/plain_communicator.h" + namespace oceanbase { + /** * @brief 用于命令行模式的通讯器 * @ingroup Communicator diff --git a/src/observer/net/communicator.cpp b/src/observer/net/communicator.cpp index 536531f31..346ec7460d 100644 --- a/src/observer/net/communicator.cpp +++ b/src/observer/net/communicator.cpp @@ -20,7 +20,9 @@ See the Mulan PSL v2 for more details. */ #include "session/session.h" #include "common/lang/mutex.h" + namespace oceanbase { + RC Communicator::init(int fd, unique_ptr session, const string &addr) { fd_ = fd; diff --git a/src/observer/net/communicator.h b/src/observer/net/communicator.h index fbf216d76..8399fd0c3 100644 --- a/src/observer/net/communicator.h +++ b/src/observer/net/communicator.h @@ -22,7 +22,9 @@ struct ConnectionContext; class SessionEvent; class Session; class BufferedWriter; + namespace oceanbase { + /** * @defgroup Communicator * @brief 负责处理与客户端的通讯 diff --git a/src/observer/net/java_thread_pool_thread_handler.cpp b/src/observer/net/java_thread_pool_thread_handler.cpp index 6c817f34a..00ccfe3fe 100644 --- a/src/observer/net/java_thread_pool_thread_handler.cpp +++ b/src/observer/net/java_thread_pool_thread_handler.cpp @@ -20,7 +20,9 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "common/thread/runnable.h" #include "common/queue/simple_queue.h" + namespace oceanbase { + using namespace common; /** diff --git a/src/observer/net/java_thread_pool_thread_handler.h b/src/observer/net/java_thread_pool_thread_handler.h index 9ec22a44a..039b00d2f 100644 --- a/src/observer/net/java_thread_pool_thread_handler.h +++ b/src/observer/net/java_thread_pool_thread_handler.h @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include "net/sql_task_handler.h" #include "common/thread/thread_pool_executor.h" #include "common/lang/mutex.h" + namespace oceanbase { + struct EventCallbackAg; /** diff --git a/src/observer/net/mysql_communicator.cpp b/src/observer/net/mysql_communicator.cpp index fa65d5699..f8a38de87 100644 --- a/src/observer/net/mysql_communicator.cpp +++ b/src/observer/net/mysql_communicator.cpp @@ -21,7 +21,9 @@ See the Mulan PSL v2 for more details. */ #include "net/buffered_writer.h" #include "net/mysql_communicator.h" #include "sql/operator/string_list_physical_operator.h" + namespace oceanbase { + /** * @brief MySQL协议相关实现 * @defgroup MySQLProtocol diff --git a/src/observer/net/mysql_communicator.h b/src/observer/net/mysql_communicator.h index 5f27b1b40..605669014 100644 --- a/src/observer/net/mysql_communicator.h +++ b/src/observer/net/mysql_communicator.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "net/communicator.h" #include "common/lang/string.h" + namespace oceanbase { + class SqlResult; class BasePacket; diff --git a/src/observer/net/one_thread_per_connection_thread_handler.cpp b/src/observer/net/one_thread_per_connection_thread_handler.cpp index f77539afc..d3681b36f 100644 --- a/src/observer/net/one_thread_per_connection_thread_handler.cpp +++ b/src/observer/net/one_thread_per_connection_thread_handler.cpp @@ -24,7 +24,9 @@ See the Mulan PSL v2 for more details. */ #include "net/sql_task_handler.h" using namespace common; + namespace oceanbase { + class Worker { public: diff --git a/src/observer/net/one_thread_per_connection_thread_handler.h b/src/observer/net/one_thread_per_connection_thread_handler.h index e3dc97912..513697a2e 100644 --- a/src/observer/net/one_thread_per_connection_thread_handler.h +++ b/src/observer/net/one_thread_per_connection_thread_handler.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #include "net/thread_handler.h" #include "common/lang/mutex.h" #include "common/lang/unordered_map.h" + namespace oceanbase { + class Worker; /** diff --git a/src/observer/net/plain_communicator.cpp b/src/observer/net/plain_communicator.cpp index 79ffc1e81..01d7a830e 100644 --- a/src/observer/net/plain_communicator.cpp +++ b/src/observer/net/plain_communicator.cpp @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ #include "net/buffered_writer.h" #include "session/session.h" #include "sql/expr/tuple.h" + namespace oceanbase { + PlainCommunicator::PlainCommunicator() { send_message_delimiter_.assign(1, '\0'); diff --git a/src/observer/net/plain_communicator.h b/src/observer/net/plain_communicator.h index 8c35f541c..3702981b9 100644 --- a/src/observer/net/plain_communicator.h +++ b/src/observer/net/plain_communicator.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "net/communicator.h" #include "common/lang/vector.h" + namespace oceanbase { + class SqlResult; /** diff --git a/src/observer/net/ring_buffer.cpp b/src/observer/net/ring_buffer.cpp index 186f9cc2b..a1b4fcda8 100644 --- a/src/observer/net/ring_buffer.cpp +++ b/src/observer/net/ring_buffer.cpp @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/algorithm.h" #include "common/log/log.h" #include "net/ring_buffer.h" + namespace oceanbase { + const int32_t DEFAULT_BUFFER_SIZE = 16 * 1024; RingBuffer::RingBuffer() : RingBuffer(DEFAULT_BUFFER_SIZE) {} diff --git a/src/observer/net/ring_buffer.h b/src/observer/net/ring_buffer.h index 80babee93..36cdd03a5 100644 --- a/src/observer/net/ring_buffer.h +++ b/src/observer/net/ring_buffer.h @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "common/lang/vector.h" + namespace oceanbase { + /** * @brief 环形缓存，当前用于通讯写入数据时的缓存 * @ingroup Communicator diff --git a/src/observer/net/server.cpp b/src/observer/net/server.cpp index b4c654ab8..da2955c06 100644 --- a/src/observer/net/server.cpp +++ b/src/observer/net/server.cpp @@ -41,7 +41,9 @@ See the Mulan PSL v2 for more details. */ #include "net/sql_task_handler.h" using namespace common; + namespace oceanbase { + ServerParam::ServerParam() { listen_addr = INADDR_ANY; diff --git a/src/observer/net/server.h b/src/observer/net/server.h index e154b838c..6de7b2c1d 100644 --- a/src/observer/net/server.h +++ b/src/observer/net/server.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "net/server_param.h" + namespace oceanbase { + class Communicator; class ThreadHandler; diff --git a/src/observer/net/server_param.h b/src/observer/net/server_param.h index 5e67ee07c..8a29534fc 100644 --- a/src/observer/net/server_param.h +++ b/src/observer/net/server_param.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "net/communicator.h" #include "common/lang/string.h" + namespace oceanbase { + /** * @brief 服务端启动参数 * @ingroup Communicator diff --git a/src/observer/net/sql_task_handler.cpp b/src/observer/net/sql_task_handler.cpp index 52bfea5f6..d7e3e9e28 100644 --- a/src/observer/net/sql_task_handler.cpp +++ b/src/observer/net/sql_task_handler.cpp @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "event/session_event.h" #include "event/sql_event.h" #include "session/session.h" + namespace oceanbase { + RC SqlTaskHandler::handle_event(Communicator *communicator) { SessionEvent *event = nullptr; diff --git a/src/observer/net/sql_task_handler.h b/src/observer/net/sql_task_handler.h index 9be9c8824..7b32eb250 100644 --- a/src/observer/net/sql_task_handler.h +++ b/src/observer/net/sql_task_handler.h @@ -21,7 +21,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse_stage.h" #include "sql/parser/resolve_stage.h" #include "sql/query_cache/query_cache_stage.h" + namespace oceanbase { + class Communicator; class SQLStageEvent; diff --git a/src/observer/net/thread_handler.cpp b/src/observer/net/thread_handler.cpp index 7c0158e04..3db34b20e 100644 --- a/src/observer/net/thread_handler.cpp +++ b/src/observer/net/thread_handler.cpp @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ #include "net/java_thread_pool_thread_handler.h" #include "common/log/log.h" #include "common/lang/string.h" + namespace oceanbase { + ThreadHandler * ThreadHandler::create(const char *name) { const char *default_name = "one-thread-per-connection"; diff --git a/src/observer/net/thread_handler.h b/src/observer/net/thread_handler.h index 45cf83380..924555f1a 100644 --- a/src/observer/net/thread_handler.h +++ b/src/observer/net/thread_handler.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" + namespace oceanbase { + class Communicator; /** diff --git a/src/observer/session/session.cpp b/src/observer/session/session.cpp index 3cd559b9c..68c9367b4 100644 --- a/src/observer/session/session.cpp +++ b/src/observer/session/session.cpp @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/db/db.h" #include "storage/default/default_handler.h" #include "storage/trx/trx.h" + namespace oceanbase { + Session &Session::default_session() { static Session session; diff --git a/src/observer/session/session.h b/src/observer/session/session.h index 35f41bb4e..ff0e4aa8e 100644 --- a/src/observer/session/session.h +++ b/src/observer/session/session.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/types.h" #include "common/lang/string.h" + namespace oceanbase { + class Trx; class Db; class SessionEvent; diff --git a/src/observer/session/session_stage.cpp b/src/observer/session/session_stage.cpp index 9c1f2b91a..fcef75450 100644 --- a/src/observer/session/session_stage.cpp +++ b/src/observer/session/session_stage.cpp @@ -27,7 +27,9 @@ See the Mulan PSL v2 for more details. */ #include "session/session.h" using namespace common; + namespace oceanbase { + // Destructor SessionStage::~SessionStage() {} diff --git a/src/observer/session/session_stage.h b/src/observer/session/session_stage.h index f0d4b1ca3..c367d661b 100644 --- a/src/observer/session/session_stage.h +++ b/src/observer/session/session_stage.h @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse_stage.h" #include "sql/parser/resolve_stage.h" #include "sql/query_cache/query_cache_stage.h" + namespace oceanbase { + /** * @brief SEDA处理的stage * @defgroup SQLStage diff --git a/src/observer/session/thread_data.cpp b/src/observer/session/thread_data.cpp index 94d62a899..774724b4c 100644 --- a/src/observer/session/thread_data.cpp +++ b/src/observer/session/thread_data.cpp @@ -14,7 +14,9 @@ See the Mulan PSL v2 for more details. */ #include "session/thread_data.h" #include "session/session.h" + namespace oceanbase { + thread_local ThreadData *ThreadData::thread_data_; Trx *ThreadData::trx() const { return (session_ == nullptr) ? nullptr : session_->current_trx(); } diff --git a/src/observer/session/thread_data.h b/src/observer/session/thread_data.h index 02caba3ba..869b156c6 100644 --- a/src/observer/session/thread_data.h +++ b/src/observer/session/thread_data.h @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ // #pragma once + namespace oceanbase { + class Trx; class Session; diff --git a/src/observer/sql/executor/analyze_table_executor.cpp b/src/observer/sql/executor/analyze_table_executor.cpp index 464a3536e..7f93d7115 100644 --- a/src/observer/sql/executor/analyze_table_executor.cpp +++ b/src/observer/sql/executor/analyze_table_executor.cpp @@ -21,7 +21,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record_scanner.h" using namespace std; + namespace oceanbase { + RC AnalyzeTableExecutor::execute(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/executor/analyze_table_executor.h b/src/observer/sql/executor/analyze_table_executor.h index 9b7b49be5..cfa344fd9 100644 --- a/src/observer/sql/executor/analyze_table_executor.h +++ b/src/observer/sql/executor/analyze_table_executor.h @@ -11,7 +11,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" + namespace oceanbase { + class SQLStageEvent; class RecordScanner; diff --git a/src/observer/sql/executor/command_executor.cpp b/src/observer/sql/executor/command_executor.cpp index 0c91efe9a..da72c0ffc 100644 --- a/src/observer/sql/executor/command_executor.cpp +++ b/src/observer/sql/executor/command_executor.cpp @@ -26,7 +26,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/executor/trx_begin_executor.h" #include "sql/executor/trx_end_executor.h" #include "sql/stmt/stmt.h" + namespace oceanbase { + RC CommandExecutor::execute(SQLStageEvent *sql_event) { Stmt *stmt = sql_event->stmt(); diff --git a/src/observer/sql/executor/command_executor.h b/src/observer/sql/executor/command_executor.h index c55eea38f..e02a7cc98 100644 --- a/src/observer/sql/executor/command_executor.h +++ b/src/observer/sql/executor/command_executor.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" + namespace oceanbase { + class SQLStageEvent; /** diff --git a/src/observer/sql/executor/create_index_executor.cpp b/src/observer/sql/executor/create_index_executor.cpp index 3a922cb4e..0038853be 100644 --- a/src/observer/sql/executor/create_index_executor.cpp +++ b/src/observer/sql/executor/create_index_executor.cpp @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ #include "session/session.h" #include "sql/stmt/create_index_stmt.h" #include "storage/table/table.h" + namespace oceanbase { + RC CreateIndexExecutor::execute(SQLStageEvent *sql_event) { Stmt *stmt = sql_event->stmt(); diff --git a/src/observer/sql/executor/create_index_executor.h b/src/observer/sql/executor/create_index_executor.h index 233200b70..35021db75 100644 --- a/src/observer/sql/executor/create_index_executor.h +++ b/src/observer/sql/executor/create_index_executor.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" + namespace oceanbase { + class SQLStageEvent; /** diff --git a/src/observer/sql/executor/create_table_executor.cpp b/src/observer/sql/executor/create_table_executor.cpp index 7b27ea82d..9c8b091ce 100644 --- a/src/observer/sql/executor/create_table_executor.cpp +++ b/src/observer/sql/executor/create_table_executor.cpp @@ -20,7 +20,9 @@ See the Mulan PSL v2 for more details. */ #include "session/session.h" #include "sql/stmt/create_table_stmt.h" #include "storage/db/db.h" + namespace oceanbase { + RC CreateTableExecutor::execute(SQLStageEvent *sql_event) { Stmt *stmt = sql_event->stmt(); diff --git a/src/observer/sql/executor/create_table_executor.h b/src/observer/sql/executor/create_table_executor.h index c1b4a93f1..b15991dd7 100644 --- a/src/observer/sql/executor/create_table_executor.h +++ b/src/observer/sql/executor/create_table_executor.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" + namespace oceanbase { + class SQLStageEvent; /** diff --git a/src/observer/sql/executor/desc_table_executor.cpp b/src/observer/sql/executor/desc_table_executor.cpp index 78b5bfd27..c248ce8db 100644 --- a/src/observer/sql/executor/desc_table_executor.cpp +++ b/src/observer/sql/executor/desc_table_executor.cpp @@ -24,7 +24,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table.h" using namespace std; + namespace oceanbase { + RC DescTableExecutor::execute(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/executor/desc_table_executor.h b/src/observer/sql/executor/desc_table_executor.h index ff6880291..428a34ebe 100644 --- a/src/observer/sql/executor/desc_table_executor.h +++ b/src/observer/sql/executor/desc_table_executor.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" + namespace oceanbase { + class SQLStageEvent; /** diff --git a/src/observer/sql/executor/execute_stage.cpp b/src/observer/sql/executor/execute_stage.cpp index c32bce231..2e77d3bfb 100644 --- a/src/observer/sql/executor/execute_stage.cpp +++ b/src/observer/sql/executor/execute_stage.cpp @@ -24,7 +24,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/default/default_handler.h" using namespace common; + namespace oceanbase { + RC ExecuteStage::handle_request(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/executor/execute_stage.h b/src/observer/sql/executor/execute_stage.h index 8cf0eb45d..ee67a49d6 100644 --- a/src/observer/sql/executor/execute_stage.h +++ b/src/observer/sql/executor/execute_stage.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" + namespace oceanbase { + class SQLStageEvent; class SessionEvent; class SelectStmt; diff --git a/src/observer/sql/executor/help_executor.h b/src/observer/sql/executor/help_executor.h index 206d4b2f1..f03e1cccf 100644 --- a/src/observer/sql/executor/help_executor.h +++ b/src/observer/sql/executor/help_executor.h @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ #include "event/sql_event.h" #include "sql/executor/sql_result.h" #include "sql/operator/string_list_physical_operator.h" + namespace oceanbase { + /** * @brief Help语句执行器 * @ingroup Executor diff --git a/src/observer/sql/executor/load_data_executor.cpp b/src/observer/sql/executor/load_data_executor.cpp index 30cc2526e..aaf976657 100644 --- a/src/observer/sql/executor/load_data_executor.cpp +++ b/src/observer/sql/executor/load_data_executor.cpp @@ -21,7 +21,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/common/chunk.h" using namespace common; + namespace oceanbase { + RC LoadDataExecutor::execute(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/executor/load_data_executor.h b/src/observer/sql/executor/load_data_executor.h index dd1bfdec2..f71a73ec3 100644 --- a/src/observer/sql/executor/load_data_executor.h +++ b/src/observer/sql/executor/load_data_executor.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" + namespace oceanbase { + class SQLStageEvent; class Table; class SqlResult; diff --git a/src/observer/sql/executor/set_variable_executor.cpp b/src/observer/sql/executor/set_variable_executor.cpp index e71e3d84b..d63c9a004 100644 --- a/src/observer/sql/executor/set_variable_executor.cpp +++ b/src/observer/sql/executor/set_variable_executor.cpp @@ -9,7 +9,9 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "sql/executor/set_variable_executor.h" + namespace oceanbase { + RC SetVariableExecutor::execute(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/executor/set_variable_executor.h b/src/observer/sql/executor/set_variable_executor.h index 8214e6afc..fcc61bcc1 100644 --- a/src/observer/sql/executor/set_variable_executor.h +++ b/src/observer/sql/executor/set_variable_executor.h @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ #include "event/sql_event.h" #include "session/session.h" #include "sql/stmt/set_variable_stmt.h" + namespace oceanbase { + /** * @brief SetVariable语句执行器 * @ingroup Executor diff --git a/src/observer/sql/executor/show_tables_executor.h b/src/observer/sql/executor/show_tables_executor.h index 5905b4490..97762ebdd 100644 --- a/src/observer/sql/executor/show_tables_executor.h +++ b/src/observer/sql/executor/show_tables_executor.h @@ -21,7 +21,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/executor/sql_result.h" #include "sql/operator/string_list_physical_operator.h" #include "storage/db/db.h" + namespace oceanbase { + /** * @brief 显示所有表的执行器 * @ingroup Executor diff --git a/src/observer/sql/executor/sql_result.cpp b/src/observer/sql/executor/sql_result.cpp index 38d7ac502..137f24825 100644 --- a/src/observer/sql/executor/sql_result.cpp +++ b/src/observer/sql/executor/sql_result.cpp @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "session/session.h" #include "storage/trx/trx.h" + namespace oceanbase { + SqlResult::SqlResult(Session *session) : session_(session) {} void SqlResult::set_tuple_schema(const TupleSchema &schema) { tuple_schema_ = schema; } diff --git a/src/observer/sql/executor/sql_result.h b/src/observer/sql/executor/sql_result.h index a63b0abac..e517e43eb 100644 --- a/src/observer/sql/executor/sql_result.h +++ b/src/observer/sql/executor/sql_result.h @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/memory.h" #include "sql/expr/tuple.h" #include "sql/operator/physical_operator.h" + namespace oceanbase { + class Session; /** diff --git a/src/observer/sql/executor/trx_begin_executor.h b/src/observer/sql/executor/trx_begin_executor.h index 72f3c3bac..c78863aec 100644 --- a/src/observer/sql/executor/trx_begin_executor.h +++ b/src/observer/sql/executor/trx_begin_executor.h @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ #include "event/sql_event.h" #include "session/session.h" #include "storage/trx/trx.h" + namespace oceanbase { + /** * @brief 事务开始语句的执行器 * @ingroup Executor diff --git a/src/observer/sql/executor/trx_end_executor.h b/src/observer/sql/executor/trx_end_executor.h index 8eb9dfc66..227a0485a 100644 --- a/src/observer/sql/executor/trx_end_executor.h +++ b/src/observer/sql/executor/trx_end_executor.h @@ -20,7 +20,9 @@ See the Mulan PSL v2 for more details. */ #include "session/session.h" #include "sql/stmt/stmt.h" #include "storage/trx/trx.h" + namespace oceanbase { + /** * @brief 事务结束的执行器，可以是提交或回滚 * @ingroup Executor diff --git a/src/observer/sql/expr/aggregate_hash_table.cpp b/src/observer/sql/expr/aggregate_hash_table.cpp index 1b89be3d6..1bd973f59 100644 --- a/src/observer/sql/expr/aggregate_hash_table.cpp +++ b/src/observer/sql/expr/aggregate_hash_table.cpp @@ -12,7 +12,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/aggregate_state.h" // ----------------------------------StandardAggregateHashTable------------------ + namespace oceanbase { + RC StandardAggregateHashTable::add_chunk(Chunk &groups_chunk, Chunk &aggrs_chunk) { if (groups_chunk.rows() != aggrs_chunk.rows()) { diff --git a/src/observer/sql/expr/aggregate_hash_table.h b/src/observer/sql/expr/aggregate_hash_table.h index 81449f33e..927e2aa2b 100644 --- a/src/observer/sql/expr/aggregate_hash_table.h +++ b/src/observer/sql/expr/aggregate_hash_table.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #include "common/math/simd_util.h" #include "common/sys/rc.h" #include "sql/expr/expression.h" + namespace oceanbase { + /** * @brief 用于hash group by 的哈希表实现，不支持并发访问。 */ diff --git a/src/observer/sql/expr/aggregate_state.cpp b/src/observer/sql/expr/aggregate_state.cpp index cbf5ba2fe..7401d6b4b 100644 --- a/src/observer/sql/expr/aggregate_state.cpp +++ b/src/observer/sql/expr/aggregate_state.cpp @@ -14,7 +14,9 @@ See the Mulan PSL v2 for more details. */ #ifdef USE_SIMD #include "common/math/simd_util.h" #endif + namespace oceanbase { + template void SumState::update(const T *values, int size) { diff --git a/src/observer/sql/expr/aggregate_state.h b/src/observer/sql/expr/aggregate_state.h index 3df4c5dd1..2e4c4b553 100644 --- a/src/observer/sql/expr/aggregate_state.h +++ b/src/observer/sql/expr/aggregate_state.h @@ -10,7 +10,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "common/type/attr_type.h" + namespace oceanbase { + template class SumState { diff --git a/src/observer/sql/expr/aggregator.cpp b/src/observer/sql/expr/aggregator.cpp index dbc9375bd..20fdccf68 100644 --- a/src/observer/sql/expr/aggregator.cpp +++ b/src/observer/sql/expr/aggregator.cpp @@ -14,7 +14,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/aggregator.h" #include "common/log/log.h" + namespace oceanbase { + RC SumAggregator::accumulate(const Value &value) { if (value_.attr_type() == AttrType::UNDEFINED) { diff --git a/src/observer/sql/expr/aggregator.h b/src/observer/sql/expr/aggregator.h index 0fb409904..e57d35e63 100644 --- a/src/observer/sql/expr/aggregator.h +++ b/src/observer/sql/expr/aggregator.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/value.h" #include "common/sys/rc.h" + namespace oceanbase { + class Aggregator { public: diff --git a/src/observer/sql/expr/arithmetic_operator.hpp b/src/observer/sql/expr/arithmetic_operator.hpp index c429b6e33..c3191cc27 100644 --- a/src/observer/sql/expr/arithmetic_operator.hpp +++ b/src/observer/sql/expr/arithmetic_operator.hpp @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #endif #include "storage/common/column.h" + namespace oceanbase { + struct Equal { template diff --git a/src/observer/sql/expr/composite_tuple.cpp b/src/observer/sql/expr/composite_tuple.cpp index a402558bb..880a5bd72 100644 --- a/src/observer/sql/expr/composite_tuple.cpp +++ b/src/observer/sql/expr/composite_tuple.cpp @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" using namespace std; + namespace oceanbase { + int CompositeTuple::cell_num() const { int num = 0; diff --git a/src/observer/sql/expr/composite_tuple.h b/src/observer/sql/expr/composite_tuple.h index 407046c7e..0641581e8 100644 --- a/src/observer/sql/expr/composite_tuple.h +++ b/src/observer/sql/expr/composite_tuple.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/expr/tuple.h" + namespace oceanbase { + /** * @brief 组合的Tuple * @ingroup Tuple diff --git a/src/observer/sql/expr/expression.cpp b/src/observer/sql/expr/expression.cpp index 89ee06021..ab058afc4 100644 --- a/src/observer/sql/expr/expression.cpp +++ b/src/observer/sql/expr/expression.cpp @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/arithmetic_operator.hpp" using namespace std; + namespace oceanbase { + RC FieldExpr::get_value(const Tuple &tuple, Value &value) const { return tuple.find_cell(TupleCellSpec(table_name(), field_name()), value); diff --git a/src/observer/sql/expr/expression.h b/src/observer/sql/expr/expression.h index bf13bc9b9..5b2868c6d 100644 --- a/src/observer/sql/expr/expression.h +++ b/src/observer/sql/expr/expression.h @@ -21,7 +21,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field.h" #include "sql/expr/aggregator.h" #include "storage/common/chunk.h" + namespace oceanbase { + class Tuple; /** diff --git a/src/observer/sql/expr/expression_iterator.cpp b/src/observer/sql/expr/expression_iterator.cpp index bd907c9e4..e46f6adbe 100644 --- a/src/observer/sql/expr/expression_iterator.cpp +++ b/src/observer/sql/expr/expression_iterator.cpp @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" using namespace std; + namespace oceanbase { + RC ExpressionIterator::iterate_child_expr(Expression &expr, function &)> callback) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/expr/expression_iterator.h b/src/observer/sql/expr/expression_iterator.h index 3f6412445..d858e2923 100644 --- a/src/observer/sql/expr/expression_iterator.h +++ b/src/observer/sql/expr/expression_iterator.h @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "common/lang/functional.h" #include "common/lang/memory.h" + namespace oceanbase { + class Expression; class ExpressionIterator diff --git a/src/observer/sql/expr/expression_tuple.h b/src/observer/sql/expr/expression_tuple.h index 59014cbf8..9946e55d7 100644 --- a/src/observer/sql/expr/expression_tuple.h +++ b/src/observer/sql/expr/expression_tuple.h @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/tuple.h" #include "common/value.h" #include "common/sys/rc.h" + namespace oceanbase { + template class ExpressionTuple : public Tuple { diff --git a/src/observer/sql/expr/tuple.h b/src/observer/sql/expr/tuple.h index 6714fb139..1c5380a0f 100644 --- a/src/observer/sql/expr/tuple.h +++ b/src/observer/sql/expr/tuple.h @@ -20,7 +20,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse.h" #include "common/value.h" #include "storage/record/record.h" + namespace oceanbase { + class Table; /** diff --git a/src/observer/sql/expr/tuple_cell.cpp b/src/observer/sql/expr/tuple_cell.cpp index c5b0d25e1..57617cc40 100644 --- a/src/observer/sql/expr/tuple_cell.cpp +++ b/src/observer/sql/expr/tuple_cell.cpp @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" using namespace std; + namespace oceanbase { + TupleCellSpec::TupleCellSpec(const char *table_name, const char *field_name, const char *alias) { if (table_name) { diff --git a/src/observer/sql/expr/tuple_cell.h b/src/observer/sql/expr/tuple_cell.h index 483be459b..844ee7e2d 100644 --- a/src/observer/sql/expr/tuple_cell.h +++ b/src/observer/sql/expr/tuple_cell.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "storage/field/field_meta.h" + namespace oceanbase { + class TupleCellSpec final { public: diff --git a/src/observer/sql/operator/aggregate_vec_physical_operator.cpp b/src/observer/sql/operator/aggregate_vec_physical_operator.cpp index d493adc02..e93ebc116 100644 --- a/src/observer/sql/operator/aggregate_vec_physical_operator.cpp +++ b/src/observer/sql/operator/aggregate_vec_physical_operator.cpp @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/composite_tuple.h" using namespace common; + namespace oceanbase { + AggregateVecPhysicalOperator::AggregateVecPhysicalOperator(vector &&expressions) { aggregate_expressions_ = std::move(expressions); diff --git a/src/observer/sql/operator/aggregate_vec_physical_operator.h b/src/observer/sql/operator/aggregate_vec_physical_operator.h index fb91cabbe..d0d7d7c46 100644 --- a/src/observer/sql/operator/aggregate_vec_physical_operator.h +++ b/src/observer/sql/operator/aggregate_vec_physical_operator.h @@ -11,7 +11,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/physical_operator.h" + namespace oceanbase { + /** * @brief 聚合物理算子 (Vectorized) * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/calc_logical_operator.h b/src/observer/sql/operator/calc_logical_operator.h index d9e0e04aa..a7c1d632f 100644 --- a/src/observer/sql/operator/calc_logical_operator.h +++ b/src/observer/sql/operator/calc_logical_operator.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/logical_operator.h" + namespace oceanbase { + /** * @brief 逻辑算子描述当前执行计划要做什么 * @details 可以看OptimizeStage中相关的代码 diff --git a/src/observer/sql/operator/calc_physical_operator.h b/src/observer/sql/operator/calc_physical_operator.h index 8098ce212..3343a58b4 100644 --- a/src/observer/sql/operator/calc_physical_operator.h +++ b/src/observer/sql/operator/calc_physical_operator.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression_tuple.h" #include "sql/operator/physical_operator.h" + namespace oceanbase { + class CalcPhysicalOperator : public PhysicalOperator { public: diff --git a/src/observer/sql/operator/delete_logical_operator.cpp b/src/observer/sql/operator/delete_logical_operator.cpp index 5132c8ddd..eeb0f316f 100644 --- a/src/observer/sql/operator/delete_logical_operator.cpp +++ b/src/observer/sql/operator/delete_logical_operator.cpp @@ -13,6 +13,8 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/delete_logical_operator.h" + namespace oceanbase { + DeleteLogicalOperator::DeleteLogicalOperator(Table *table) : table_(table) {} } \ No newline at end of file diff --git a/src/observer/sql/operator/delete_logical_operator.h b/src/observer/sql/operator/delete_logical_operator.h index 2675d221d..919501165 100644 --- a/src/observer/sql/operator/delete_logical_operator.h +++ b/src/observer/sql/operator/delete_logical_operator.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/logical_operator.h" + namespace oceanbase { + /** * @brief 逻辑算子，用于执行delete语句 * @ingroup LogicalOperator diff --git a/src/observer/sql/operator/delete_physical_operator.cpp b/src/observer/sql/operator/delete_physical_operator.cpp index acba338ae..274446bc1 100644 --- a/src/observer/sql/operator/delete_physical_operator.cpp +++ b/src/observer/sql/operator/delete_physical_operator.cpp @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "storage/table/table.h" #include "storage/trx/trx.h" + namespace oceanbase { + RC DeletePhysicalOperator::open(Trx *trx) { if (children_.empty()) { diff --git a/src/observer/sql/operator/delete_physical_operator.h b/src/observer/sql/operator/delete_physical_operator.h index 668569892..b0e29ad91 100644 --- a/src/observer/sql/operator/delete_physical_operator.h +++ b/src/observer/sql/operator/delete_physical_operator.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/physical_operator.h" + namespace oceanbase { + class Trx; class DeleteStmt; diff --git a/src/observer/sql/operator/explain_logical_operator.h b/src/observer/sql/operator/explain_logical_operator.h index 34d2066d7..9f93151c7 100644 --- a/src/observer/sql/operator/explain_logical_operator.h +++ b/src/observer/sql/operator/explain_logical_operator.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/logical_operator.h" + namespace oceanbase { + /** * @brief Explain逻辑算子 * @ingroup LogicalOperator diff --git a/src/observer/sql/operator/explain_physical_operator.cpp b/src/observer/sql/operator/explain_physical_operator.cpp index 7725902e8..34a082181 100644 --- a/src/observer/sql/operator/explain_physical_operator.cpp +++ b/src/observer/sql/operator/explain_physical_operator.cpp @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" using namespace std; + namespace oceanbase { + RC ExplainPhysicalOperator::open(Trx *) { ASSERT(children_.size() == 1, "explain must has 1 child"); diff --git a/src/observer/sql/operator/explain_physical_operator.h b/src/observer/sql/operator/explain_physical_operator.h index c9b22f091..cbcc85076 100644 --- a/src/observer/sql/operator/explain_physical_operator.h +++ b/src/observer/sql/operator/explain_physical_operator.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/physical_operator.h" + namespace oceanbase { + /** * @brief Explain物理算子 * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/expr_vec_physical_operator.cpp b/src/observer/sql/operator/expr_vec_physical_operator.cpp index 45c21b105..e767b46f6 100644 --- a/src/observer/sql/operator/expr_vec_physical_operator.cpp +++ b/src/observer/sql/operator/expr_vec_physical_operator.cpp @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; + namespace oceanbase { + ExprVecPhysicalOperator::ExprVecPhysicalOperator(vector &&expressions) { expressions_ = std::move(expressions); diff --git a/src/observer/sql/operator/expr_vec_physical_operator.h b/src/observer/sql/operator/expr_vec_physical_operator.h index 371786a22..525c6efd9 100644 --- a/src/observer/sql/operator/expr_vec_physical_operator.h +++ b/src/observer/sql/operator/expr_vec_physical_operator.h @@ -11,7 +11,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/physical_operator.h" + namespace oceanbase { + /** * @brief 表达式物理算子(Vectorized) * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/group_by_logical_operator.cpp b/src/observer/sql/operator/group_by_logical_operator.cpp index f3f9d83fa..88712d85e 100644 --- a/src/observer/sql/operator/group_by_logical_operator.cpp +++ b/src/observer/sql/operator/group_by_logical_operator.cpp @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" using namespace std; + namespace oceanbase { + GroupByLogicalOperator::GroupByLogicalOperator(vector> &&group_by_exprs, vector &&expressions) { diff --git a/src/observer/sql/operator/group_by_logical_operator.h b/src/observer/sql/operator/group_by_logical_operator.h index 1a1b25e1b..ee949033c 100644 --- a/src/observer/sql/operator/group_by_logical_operator.h +++ b/src/observer/sql/operator/group_by_logical_operator.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/logical_operator.h" + namespace oceanbase { + class GroupByLogicalOperator : public LogicalOperator { public: diff --git a/src/observer/sql/operator/group_by_physical_operator.cpp b/src/observer/sql/operator/group_by_physical_operator.cpp index 503682244..07ce4f688 100644 --- a/src/observer/sql/operator/group_by_physical_operator.cpp +++ b/src/observer/sql/operator/group_by_physical_operator.cpp @@ -20,7 +20,9 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; + namespace oceanbase { + GroupByPhysicalOperator::GroupByPhysicalOperator(vector &&expressions) { aggregate_expressions_ = std::move(expressions); diff --git a/src/observer/sql/operator/group_by_physical_operator.h b/src/observer/sql/operator/group_by_physical_operator.h index cfadcbc98..ff226ab07 100644 --- a/src/observer/sql/operator/group_by_physical_operator.h +++ b/src/observer/sql/operator/group_by_physical_operator.h @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/tuple.h" #include "sql/operator/physical_operator.h" #include "sql/expr/composite_tuple.h" + namespace oceanbase { + /** * @brief Group By 物理算子基类 * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/group_by_vec_physical_operator.h b/src/observer/sql/operator/group_by_vec_physical_operator.h index 578b2be6f..de6b5cd90 100644 --- a/src/observer/sql/operator/group_by_vec_physical_operator.h +++ b/src/observer/sql/operator/group_by_vec_physical_operator.h @@ -12,7 +12,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/aggregate_hash_table.h" #include "sql/operator/physical_operator.h" + namespace oceanbase { + /** * @brief Group By 物理算子(vectorized) * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/hash_group_by_physical_operator.cpp b/src/observer/sql/operator/hash_group_by_physical_operator.cpp index 0f33cf53e..cc0b46c29 100644 --- a/src/observer/sql/operator/hash_group_by_physical_operator.cpp +++ b/src/observer/sql/operator/hash_group_by_physical_operator.cpp @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; + namespace oceanbase { + HashGroupByPhysicalOperator::HashGroupByPhysicalOperator( vector> &&group_by_exprs, vector &&expressions) : GroupByPhysicalOperator(std::move(expressions)), group_by_exprs_(std::move(group_by_exprs)) diff --git a/src/observer/sql/operator/hash_group_by_physical_operator.h b/src/observer/sql/operator/hash_group_by_physical_operator.h index 00ae47fc5..a56581b0d 100644 --- a/src/observer/sql/operator/hash_group_by_physical_operator.h +++ b/src/observer/sql/operator/hash_group_by_physical_operator.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/group_by_physical_operator.h" #include "sql/expr/composite_tuple.h" + namespace oceanbase { + /** * @brief Group By Hash 方式物理算子 * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/hash_join_physical_operator.h b/src/observer/sql/operator/hash_join_physical_operator.h index c3ef44fad..da4474eb3 100644 --- a/src/observer/sql/operator/hash_join_physical_operator.h +++ b/src/observer/sql/operator/hash_join_physical_operator.h @@ -12,7 +12,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "sql/parser/parse.h" + namespace oceanbase { + /** * @brief Hash Join 算子 * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/index_scan_physical_operator.cpp b/src/observer/sql/operator/index_scan_physical_operator.cpp index 89eb0f6db..c70dcc21c 100644 --- a/src/observer/sql/operator/index_scan_physical_operator.cpp +++ b/src/observer/sql/operator/index_scan_physical_operator.cpp @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/index_scan_physical_operator.h" #include "storage/index/index.h" #include "storage/trx/trx.h" + namespace oceanbase { + IndexScanPhysicalOperator::IndexScanPhysicalOperator(Table *table, Index *index, ReadWriteMode mode, const Value *left_value, bool left_inclusive, const Value *right_value, bool right_inclusive) : table_(table), diff --git a/src/observer/sql/operator/index_scan_physical_operator.h b/src/observer/sql/operator/index_scan_physical_operator.h index 06da7d357..1fc9e09e1 100644 --- a/src/observer/sql/operator/index_scan_physical_operator.h +++ b/src/observer/sql/operator/index_scan_physical_operator.h @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/tuple.h" #include "sql/operator/physical_operator.h" #include "storage/record/record_manager.h" + namespace oceanbase { + /** * @brief 索引扫描物理算子 * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/insert_logical_operator.cpp b/src/observer/sql/operator/insert_logical_operator.cpp index 0ec1ef8e4..8357d032b 100644 --- a/src/observer/sql/operator/insert_logical_operator.cpp +++ b/src/observer/sql/operator/insert_logical_operator.cpp @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/insert_logical_operator.h" + namespace oceanbase { + InsertLogicalOperator::InsertLogicalOperator(Table *table, vector values) : table_(table), values_(values) {} } \ No newline at end of file diff --git a/src/observer/sql/operator/insert_logical_operator.h b/src/observer/sql/operator/insert_logical_operator.h index bb8491461..4f0022df4 100644 --- a/src/observer/sql/operator/insert_logical_operator.h +++ b/src/observer/sql/operator/insert_logical_operator.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/logical_operator.h" #include "sql/parser/parse_defs.h" + namespace oceanbase { + /** * @brief 插入逻辑算子 * @ingroup LogicalOperator diff --git a/src/observer/sql/operator/insert_physical_operator.cpp b/src/observer/sql/operator/insert_physical_operator.cpp index 841b4cf53..b799c5dc0 100644 --- a/src/observer/sql/operator/insert_physical_operator.cpp +++ b/src/observer/sql/operator/insert_physical_operator.cpp @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/trx/trx.h" using namespace std; + namespace oceanbase { + InsertPhysicalOperator::InsertPhysicalOperator(Table *table, vector &&values) : table_(table), values_(std::move(values)) {} diff --git a/src/observer/sql/operator/insert_physical_operator.h b/src/observer/sql/operator/insert_physical_operator.h index c98b0fbb4..f3635a2b2 100644 --- a/src/observer/sql/operator/insert_physical_operator.h +++ b/src/observer/sql/operator/insert_physical_operator.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "sql/parser/parse.h" + namespace oceanbase { + class InsertStmt; /** diff --git a/src/observer/sql/operator/join_logical_operator.h b/src/observer/sql/operator/join_logical_operator.h index ea602a3c6..bbd1557f1 100644 --- a/src/observer/sql/operator/join_logical_operator.h +++ b/src/observer/sql/operator/join_logical_operator.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/logical_operator.h" + namespace oceanbase { + /** * @brief 连接算子 * @ingroup LogicalOperator diff --git a/src/observer/sql/operator/join_physical_operator.cpp b/src/observer/sql/operator/join_physical_operator.cpp index 303b3ebb0..2bf3593e8 100644 --- a/src/observer/sql/operator/join_physical_operator.cpp +++ b/src/observer/sql/operator/join_physical_operator.cpp @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/join_physical_operator.h" + namespace oceanbase { + NestedLoopJoinPhysicalOperator::NestedLoopJoinPhysicalOperator() {} RC NestedLoopJoinPhysicalOperator::open(Trx *trx) diff --git a/src/observer/sql/operator/join_physical_operator.h b/src/observer/sql/operator/join_physical_operator.h index 58ec311fe..dc48d9056 100644 --- a/src/observer/sql/operator/join_physical_operator.h +++ b/src/observer/sql/operator/join_physical_operator.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "sql/parser/parse.h" + namespace oceanbase { + /** * @brief 最简单的两表（称为左表、右表）join算子 * @details 依次遍历左表的每一行，然后关联右表的每一行 diff --git a/src/observer/sql/operator/logical_operator.cpp b/src/observer/sql/operator/logical_operator.cpp index f21b0ea52..4aa24db45 100644 --- a/src/observer/sql/operator/logical_operator.cpp +++ b/src/observer/sql/operator/logical_operator.cpp @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/logical_operator.h" + namespace oceanbase { + LogicalOperator::~LogicalOperator() {} void LogicalOperator::add_child(unique_ptr oper) { diff --git a/src/observer/sql/operator/logical_operator.h b/src/observer/sql/operator/logical_operator.h index 4dc080dfe..f6ba86721 100644 --- a/src/observer/sql/operator/logical_operator.h +++ b/src/observer/sql/operator/logical_operator.h @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "sql/operator/operator_node.h" #include "common/lang/unordered_set.h" + namespace oceanbase { + /** * @brief 逻辑算子 * @defgroup LogicalOperator diff --git a/src/observer/sql/operator/nested_loop_join_physical_operator.cpp b/src/observer/sql/operator/nested_loop_join_physical_operator.cpp index f1134e5e2..f37d1a17a 100644 --- a/src/observer/sql/operator/nested_loop_join_physical_operator.cpp +++ b/src/observer/sql/operator/nested_loop_join_physical_operator.cpp @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/nested_loop_join_physical_operator.h" + namespace oceanbase { + NestedLoopJoinPhysicalOperator::NestedLoopJoinPhysicalOperator() {} RC NestedLoopJoinPhysicalOperator::open(Trx *trx) diff --git a/src/observer/sql/operator/nested_loop_join_physical_operator.h b/src/observer/sql/operator/nested_loop_join_physical_operator.h index 3a6e29ad4..13bb8314d 100644 --- a/src/observer/sql/operator/nested_loop_join_physical_operator.h +++ b/src/observer/sql/operator/nested_loop_join_physical_operator.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "sql/parser/parse.h" + namespace oceanbase { + /** * @brief 最简单的两表（称为左表、右表）join算子 * @details 依次遍历左表的每一行，然后关联右表的每一行 diff --git a/src/observer/sql/operator/operator_node.h b/src/observer/sql/operator/operator_node.h index b8e1d602e..3071e20aa 100644 --- a/src/observer/sql/operator/operator_node.h +++ b/src/observer/sql/operator/operator_node.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/memory.h" #include "sql/optimizer/cascade/property.h" #include "sql/optimizer/cascade/cost_model.h" + namespace oceanbase { + /** * @brief Operator type(including logical and physical) */ diff --git a/src/observer/sql/operator/physical_operator.cpp b/src/observer/sql/operator/physical_operator.cpp index 2334f33f6..b9eebd17a 100644 --- a/src/observer/sql/operator/physical_operator.cpp +++ b/src/observer/sql/operator/physical_operator.cpp @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/physical_operator.h" + namespace oceanbase { + string physical_operator_type_name(PhysicalOperatorType type) { switch (type) { diff --git a/src/observer/sql/operator/physical_operator.h b/src/observer/sql/operator/physical_operator.h index a8c71b989..21ea01441 100644 --- a/src/observer/sql/operator/physical_operator.h +++ b/src/observer/sql/operator/physical_operator.h @@ -21,7 +21,9 @@ See the Mulan PSL v2 for more details. */ class Record; class TupleCellSpec; class Trx; + namespace oceanbase { + /** * @brief 物理算子 * @defgroup PhysicalOperator diff --git a/src/observer/sql/operator/predicate_logical_operator.cpp b/src/observer/sql/operator/predicate_logical_operator.cpp index f726654fe..bb0b94c55 100644 --- a/src/observer/sql/operator/predicate_logical_operator.cpp +++ b/src/observer/sql/operator/predicate_logical_operator.cpp @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ // #include "sql/operator/predicate_logical_operator.h" + namespace oceanbase { + PredicateLogicalOperator::PredicateLogicalOperator(unique_ptr expression) { expressions_.emplace_back(std::move(expression)); diff --git a/src/observer/sql/operator/predicate_logical_operator.h b/src/observer/sql/operator/predicate_logical_operator.h index 68cbdfa28..006e3cce0 100644 --- a/src/observer/sql/operator/predicate_logical_operator.h +++ b/src/observer/sql/operator/predicate_logical_operator.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "sql/operator/logical_operator.h" + namespace oceanbase { + /** * @brief 谓词/过滤逻辑算子 * @ingroup LogicalOperator diff --git a/src/observer/sql/operator/predicate_physical_operator.cpp b/src/observer/sql/operator/predicate_physical_operator.cpp index 2f245531c..7fba74990 100644 --- a/src/observer/sql/operator/predicate_physical_operator.cpp +++ b/src/observer/sql/operator/predicate_physical_operator.cpp @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/filter_stmt.h" #include "storage/field/field.h" #include "storage/record/record.h" + namespace oceanbase { + PredicatePhysicalOperator::PredicatePhysicalOperator(std::unique_ptr expr) : expression_(std::move(expr)) { ASSERT(expression_->value_type() == AttrType::BOOLEANS, "predicate's expression should be BOOLEAN type"); diff --git a/src/observer/sql/operator/predicate_physical_operator.h b/src/observer/sql/operator/predicate_physical_operator.h index acbd498e1..5c717ee84 100644 --- a/src/observer/sql/operator/predicate_physical_operator.h +++ b/src/observer/sql/operator/predicate_physical_operator.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "sql/operator/physical_operator.h" + namespace oceanbase { + class FilterStmt; /** diff --git a/src/observer/sql/operator/project_logical_operator.cpp b/src/observer/sql/operator/project_logical_operator.cpp index 49f09ec7f..1127eeee7 100644 --- a/src/observer/sql/operator/project_logical_operator.cpp +++ b/src/observer/sql/operator/project_logical_operator.cpp @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/project_logical_operator.h" using namespace std; + namespace oceanbase { + ProjectLogicalOperator::ProjectLogicalOperator(vector> &&expressions) { expressions_ = std::move(expressions); diff --git a/src/observer/sql/operator/project_logical_operator.h b/src/observer/sql/operator/project_logical_operator.h index e703d45ee..8bc9d695f 100644 --- a/src/observer/sql/operator/project_logical_operator.h +++ b/src/observer/sql/operator/project_logical_operator.h @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "sql/operator/logical_operator.h" #include "storage/field/field.h" + namespace oceanbase { + /** * @brief project 表示投影运算 * @ingroup LogicalOperator diff --git a/src/observer/sql/operator/project_physical_operator.cpp b/src/observer/sql/operator/project_physical_operator.cpp index 510a5cb4e..9c8b46787 100644 --- a/src/observer/sql/operator/project_physical_operator.cpp +++ b/src/observer/sql/operator/project_physical_operator.cpp @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table.h" using namespace std; + namespace oceanbase { + ProjectPhysicalOperator::ProjectPhysicalOperator(vector> &&expressions) : expressions_(std::move(expressions)), tuple_(expressions_) { diff --git a/src/observer/sql/operator/project_physical_operator.h b/src/observer/sql/operator/project_physical_operator.h index 25e579e82..c587ff232 100644 --- a/src/observer/sql/operator/project_physical_operator.h +++ b/src/observer/sql/operator/project_physical_operator.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "sql/expr/expression_tuple.h" + namespace oceanbase { + /** * @brief 选择/投影物理算子 * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/project_vec_physical_operator.cpp b/src/observer/sql/operator/project_vec_physical_operator.cpp index 8a834ba2b..40c7fea96 100644 --- a/src/observer/sql/operator/project_vec_physical_operator.cpp +++ b/src/observer/sql/operator/project_vec_physical_operator.cpp @@ -14,7 +14,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table.h" using namespace std; + namespace oceanbase { + ProjectVecPhysicalOperator::ProjectVecPhysicalOperator(vector> &&expressions) : expressions_(std::move(expressions)) { diff --git a/src/observer/sql/operator/project_vec_physical_operator.h b/src/observer/sql/operator/project_vec_physical_operator.h index 0e16974b3..6b98dd7a4 100644 --- a/src/observer/sql/operator/project_vec_physical_operator.h +++ b/src/observer/sql/operator/project_vec_physical_operator.h @@ -12,7 +12,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "sql/expr/expression_tuple.h" + namespace oceanbase { + /** * @brief 选择/投影物理算子(vectorized) * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/scalar_group_by_physical_operator.cpp b/src/observer/sql/operator/scalar_group_by_physical_operator.cpp index 1c5557b81..511a8ed91 100644 --- a/src/observer/sql/operator/scalar_group_by_physical_operator.cpp +++ b/src/observer/sql/operator/scalar_group_by_physical_operator.cpp @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; + namespace oceanbase { + ScalarGroupByPhysicalOperator::ScalarGroupByPhysicalOperator(vector &&expressions) : GroupByPhysicalOperator(std::move(expressions)) {} diff --git a/src/observer/sql/operator/scalar_group_by_physical_operator.h b/src/observer/sql/operator/scalar_group_by_physical_operator.h index d44f1ae17..dbf27db97 100644 --- a/src/observer/sql/operator/scalar_group_by_physical_operator.h +++ b/src/observer/sql/operator/scalar_group_by_physical_operator.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/operator/group_by_physical_operator.h" + namespace oceanbase { + /** * @brief 没有 group by 表达式的 group by 物理算子 * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/string_list_physical_operator.h b/src/observer/sql/operator/string_list_physical_operator.h index 81d22b5b9..b47fcfbc3 100644 --- a/src/observer/sql/operator/string_list_physical_operator.h +++ b/src/observer/sql/operator/string_list_physical_operator.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/initializer_list.h" #include "sql/operator/physical_operator.h" + namespace oceanbase { + /** * @brief 字符串列表物理算子 * @ingroup PhysicalOperator diff --git a/src/observer/sql/operator/table_get_logical_operator.cpp b/src/observer/sql/operator/table_get_logical_operator.cpp index fa0b2c14d..cfa96167d 100644 --- a/src/observer/sql/operator/table_get_logical_operator.cpp +++ b/src/observer/sql/operator/table_get_logical_operator.cpp @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/table_get_logical_operator.h" #include "sql/optimizer/cascade/property.h" #include "catalog/catalog.h" + namespace oceanbase { + TableGetLogicalOperator::TableGetLogicalOperator(Table *table, ReadWriteMode mode) : LogicalOperator(), table_(table), mode_(mode) {} diff --git a/src/observer/sql/operator/table_get_logical_operator.h b/src/observer/sql/operator/table_get_logical_operator.h index 2ac8bdf8d..95456ce2a 100644 --- a/src/observer/sql/operator/table_get_logical_operator.h +++ b/src/observer/sql/operator/table_get_logical_operator.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/logical_operator.h" #include "storage/field/field.h" #include "common/types.h" + namespace oceanbase { + /** * @brief 表示从表中获取数据的算子 * @details 比如使用全表扫描、通过索引获取数据等 diff --git a/src/observer/sql/operator/table_scan_physical_operator.cpp b/src/observer/sql/operator/table_scan_physical_operator.cpp index 140e21ac3..bb39da974 100644 --- a/src/observer/sql/operator/table_scan_physical_operator.cpp +++ b/src/observer/sql/operator/table_scan_physical_operator.cpp @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table.h" using namespace std; + namespace oceanbase { + RC TableScanPhysicalOperator::open(Trx *trx) { RC rc = table_->get_record_scanner(record_scanner_, trx, mode_); diff --git a/src/observer/sql/operator/table_scan_physical_operator.h b/src/observer/sql/operator/table_scan_physical_operator.h index 34bbe14ea..4f881e33d 100644 --- a/src/observer/sql/operator/table_scan_physical_operator.h +++ b/src/observer/sql/operator/table_scan_physical_operator.h @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record_manager.h" #include "storage/record/record_scanner.h" #include "common/types.h" + namespace oceanbase { + class Table; /** diff --git a/src/observer/sql/operator/table_scan_vec_physical_operator.cpp b/src/observer/sql/operator/table_scan_vec_physical_operator.cpp index f2fde68af..ea1a16869 100644 --- a/src/observer/sql/operator/table_scan_vec_physical_operator.cpp +++ b/src/observer/sql/operator/table_scan_vec_physical_operator.cpp @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table.h" using namespace std; + namespace oceanbase { + RC TableScanVecPhysicalOperator::open(Trx *trx) { RC rc = table_->get_chunk_scanner(chunk_scanner_, trx, mode_); diff --git a/src/observer/sql/operator/table_scan_vec_physical_operator.h b/src/observer/sql/operator/table_scan_vec_physical_operator.h index ee8a87aaa..5fc2c433d 100644 --- a/src/observer/sql/operator/table_scan_vec_physical_operator.h +++ b/src/observer/sql/operator/table_scan_vec_physical_operator.h @@ -14,7 +14,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/physical_operator.h" #include "storage/record/record_manager.h" #include "common/types.h" + namespace oceanbase { + class Table; /** diff --git a/src/observer/sql/optimizer/cascade/cost_model.cpp b/src/observer/sql/optimizer/cascade/cost_model.cpp index 7d9fdf51a..14f2beb39 100644 --- a/src/observer/sql/optimizer/cascade/cost_model.cpp +++ b/src/observer/sql/optimizer/cascade/cost_model.cpp @@ -12,7 +12,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/memo.h" #include "catalog/catalog.h" #include "sql/optimizer/cascade/group_expr.h" + namespace oceanbase { + double CostModel::calculate_cost(Memo *memo, GroupExpr *gexpr) { diff --git a/src/observer/sql/optimizer/cascade/cost_model.h b/src/observer/sql/optimizer/cascade/cost_model.h index 9d73eb2cd..fbb070c3d 100644 --- a/src/observer/sql/optimizer/cascade/cost_model.h +++ b/src/observer/sql/optimizer/cascade/cost_model.h @@ -9,7 +9,9 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #pragma once + namespace oceanbase { + class Memo; class GroupExpr; /** diff --git a/src/observer/sql/optimizer/cascade/group.cpp b/src/observer/sql/optimizer/cascade/group.cpp index 8b2fd7864..4975097a6 100644 --- a/src/observer/sql/optimizer/cascade/group.cpp +++ b/src/observer/sql/optimizer/cascade/group.cpp @@ -11,7 +11,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/group.h" #include "sql/optimizer/cascade/group_expr.h" #include "sql/optimizer/cascade/memo.h" + namespace oceanbase { + Group::Group(int id, GroupExpr* expr, Memo *memo) : id_(id), winner_(std::make_tuple(numeric_limits::max(), nullptr)), has_explored_(false) { diff --git a/src/observer/sql/optimizer/cascade/group.h b/src/observer/sql/optimizer/cascade/group.h index 5ec7fb323..5f18b0c39 100644 --- a/src/observer/sql/optimizer/cascade/group.h +++ b/src/observer/sql/optimizer/cascade/group.h @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "common/lang/unordered_map.h" #include "sql/optimizer/cascade/property_set.h" + namespace oceanbase { + class GroupExpr; class Memo; /** diff --git a/src/observer/sql/optimizer/cascade/group_expr.cpp b/src/observer/sql/optimizer/cascade/group_expr.cpp index 4efd79a3c..67cd2b892 100644 --- a/src/observer/sql/optimizer/cascade/group_expr.cpp +++ b/src/observer/sql/optimizer/cascade/group_expr.cpp @@ -9,7 +9,9 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/group_expr.h" + namespace oceanbase { + uint64_t GroupExpr::hash() const { auto hash = contents_->hash(); diff --git a/src/observer/sql/optimizer/cascade/group_expr.h b/src/observer/sql/optimizer/cascade/group_expr.h index 70a5dcd8f..154700343 100644 --- a/src/observer/sql/optimizer/cascade/group_expr.h +++ b/src/observer/sql/optimizer/cascade/group_expr.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/operator_node.h" #include "sql/optimizer/cascade/rules.h" #include "sql/optimizer/cascade/property_set.h" + namespace oceanbase { + // TODO: rename to m_expr(in columbia)? /* GroupExpr used to represent a particular logical or physical * operator expression. diff --git a/src/observer/sql/optimizer/cascade/implementation_rules.cpp b/src/observer/sql/optimizer/cascade/implementation_rules.cpp index 2e923861f..864335cb9 100644 --- a/src/observer/sql/optimizer/cascade/implementation_rules.cpp +++ b/src/observer/sql/optimizer/cascade/implementation_rules.cpp @@ -27,7 +27,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/group_by_logical_operator.h" #include "sql/operator/scalar_group_by_physical_operator.h" #include "sql/operator/hash_group_by_physical_operator.h" + namespace oceanbase { + // ------------------------------------------------------------------------------------------------- // PhysicalSeqScan // ------------------------------------------------------------------------------------------------- diff --git a/src/observer/sql/optimizer/cascade/implementation_rules.h b/src/observer/sql/optimizer/cascade/implementation_rules.h index 4c0c9e0a6..dec06f6de 100644 --- a/src/observer/sql/optimizer/cascade/implementation_rules.h +++ b/src/observer/sql/optimizer/cascade/implementation_rules.h @@ -11,7 +11,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/optimizer/cascade/rules.h" + namespace oceanbase { + /** * Rule transforms Logical Scan -> Physical Scan */ diff --git a/src/observer/sql/optimizer/cascade/memo.cpp b/src/observer/sql/optimizer/cascade/memo.cpp index ddb3230cc..c4e0a5a5e 100644 --- a/src/observer/sql/optimizer/cascade/memo.cpp +++ b/src/observer/sql/optimizer/cascade/memo.cpp @@ -9,7 +9,9 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/memo.h" + namespace oceanbase { + GroupExpr *Memo::insert_expression(GroupExpr *gexpr, int target_group) { gexpr->set_group_id(target_group); diff --git a/src/observer/sql/optimizer/cascade/memo.h b/src/observer/sql/optimizer/cascade/memo.h index ab8d74d07..e12853102 100644 --- a/src/observer/sql/optimizer/cascade/memo.h +++ b/src/observer/sql/optimizer/cascade/memo.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "sql/optimizer/cascade/group_expr.h" #include "sql/optimizer/cascade/group.h" + namespace oceanbase { + const int UNDEFINED_GROUP = -1; /** diff --git a/src/observer/sql/optimizer/cascade/optimizer.cpp b/src/observer/sql/optimizer/cascade/optimizer.cpp index 65e9d1dcb..9e2a84f1f 100644 --- a/src/observer/sql/optimizer/cascade/optimizer.cpp +++ b/src/observer/sql/optimizer/cascade/optimizer.cpp @@ -11,7 +11,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/optimizer.h" #include "sql/optimizer/cascade/tasks/o_group_task.h" #include "sql/optimizer/cascade/memo.h" + namespace oceanbase { + std::unique_ptr Optimizer::optimize(OperatorNode* op_tree) { // Generate initial operator tree from query tree diff --git a/src/observer/sql/optimizer/cascade/optimizer.h b/src/observer/sql/optimizer/cascade/optimizer.h index 882157e05..49981dad0 100644 --- a/src/observer/sql/optimizer/cascade/optimizer.h +++ b/src/observer/sql/optimizer/cascade/optimizer.h @@ -14,7 +14,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/optimizer_context.h" #include "sql/operator/physical_operator.h" #include "sql/optimizer/cascade/property_set.h" + namespace oceanbase { + /** * @brief cascade optimizer * TODO: currently, Optimizer is used for CBO optimization. need to unify the optimizer in miniob diff --git a/src/observer/sql/optimizer/cascade/optimizer_context.cpp b/src/observer/sql/optimizer/cascade/optimizer_context.cpp index 3b132451b..e84c083f3 100644 --- a/src/observer/sql/optimizer/cascade/optimizer_context.cpp +++ b/src/observer/sql/optimizer/cascade/optimizer_context.cpp @@ -11,7 +11,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/optimizer_context.h" #include "sql/optimizer/cascade/memo.h" #include "sql/optimizer/cascade/rules.h" + namespace oceanbase { + OptimizerContext::OptimizerContext() : memo_(new Memo()), rule_set_(new RuleSet()), cost_model_(), task_pool_(nullptr), cost_upper_bound_(std::numeric_limits::max()) {} diff --git a/src/observer/sql/optimizer/cascade/optimizer_context.h b/src/observer/sql/optimizer/cascade/optimizer_context.h index d924cbc6d..c33f59986 100644 --- a/src/observer/sql/optimizer/cascade/optimizer_context.h +++ b/src/observer/sql/optimizer/cascade/optimizer_context.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/pending_tasks.h" #include "sql/operator/operator_node.h" #include "sql/optimizer/cascade/property_set.h" + namespace oceanbase { + class Memo; class RuleSet; /** diff --git a/src/observer/sql/optimizer/cascade/pattern.h b/src/observer/sql/optimizer/cascade/pattern.h index 9a5573983..8d3126c49 100644 --- a/src/observer/sql/optimizer/cascade/pattern.h +++ b/src/observer/sql/optimizer/cascade/pattern.h @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/operator/operator_node.h" #include "common/lang/vector.h" #include "common/lang/memory.h" + namespace oceanbase { + class Pattern { public: diff --git a/src/observer/sql/optimizer/cascade/pending_tasks.h b/src/observer/sql/optimizer/cascade/pending_tasks.h index af406d4e0..b4ec336ca 100644 --- a/src/observer/sql/optimizer/cascade/pending_tasks.h +++ b/src/observer/sql/optimizer/cascade/pending_tasks.h @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/stack.h" #include "common/log/log.h" #include "sql/optimizer/cascade/tasks/cascade_task.h" + namespace oceanbase { + /** * @brief This collection of undone cascade tasks is currently stored as a stack. */ diff --git a/src/observer/sql/optimizer/cascade/property.h b/src/observer/sql/optimizer/cascade/property.h index 9b42f3063..41a6e4e05 100644 --- a/src/observer/sql/optimizer/cascade/property.h +++ b/src/observer/sql/optimizer/cascade/property.h @@ -9,7 +9,9 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #pragma once + namespace oceanbase { + class Property {}; diff --git a/src/observer/sql/optimizer/cascade/property_set.h b/src/observer/sql/optimizer/cascade/property_set.h index e5d7ccff2..651a095e4 100644 --- a/src/observer/sql/optimizer/cascade/property_set.h +++ b/src/observer/sql/optimizer/cascade/property_set.h @@ -11,7 +11,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/optimizer/cascade/property.h" + namespace oceanbase { + class PropertySet; struct PropSetPtrHash { diff --git a/src/observer/sql/optimizer/cascade/rules.cpp b/src/observer/sql/optimizer/cascade/rules.cpp index 97c015cd7..1b28ff51f 100644 --- a/src/observer/sql/optimizer/cascade/rules.cpp +++ b/src/observer/sql/optimizer/cascade/rules.cpp @@ -11,7 +11,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/rules.h" #include "sql/optimizer/cascade/implementation_rules.h" #include "sql/optimizer/cascade/group_expr.h" + namespace oceanbase { + RuleSet::RuleSet() { add_rule(RuleSetName::PHYSICAL_IMPLEMENTATION, new LogicalProjectionToProjection()); diff --git a/src/observer/sql/optimizer/cascade/rules.h b/src/observer/sql/optimizer/cascade/rules.h index 0bf9a559c..57cff90f0 100644 --- a/src/observer/sql/optimizer/cascade/rules.h +++ b/src/observer/sql/optimizer/cascade/rules.h @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/unordered_map.h" #include "sql/optimizer/cascade/optimizer_context.h" #include "sql/optimizer/cascade/pattern.h" + namespace oceanbase { + /** * @brief: Enum defining the types of rules */ diff --git a/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.cpp b/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.cpp index 10056df57..c5dc6b4f7 100644 --- a/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.cpp @@ -14,7 +14,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/group_expr.h" #include "sql/optimizer/cascade/rules.h" #include "common/log/log.h" + namespace oceanbase { + void ApplyRule::perform() { LOG_TRACE("ApplyRule::perform() for rule: {%d}", rule_->get_rule_idx()); diff --git a/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.h b/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.h index dd670f5c0..6f91abe56 100644 --- a/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.h @@ -12,7 +12,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/tasks/cascade_task.h" #include "sql/optimizer/cascade/rules.h" + namespace oceanbase { + /** * @brief ApplyRule task */ diff --git a/src/observer/sql/optimizer/cascade/tasks/cascade_task.cpp b/src/observer/sql/optimizer/cascade/tasks/cascade_task.cpp index 19e2d619d..e32e5bd4a 100644 --- a/src/observer/sql/optimizer/cascade/tasks/cascade_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/cascade_task.cpp @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/group_expr.h" #include "sql/optimizer/cascade/rules.h" #include "sql/optimizer/cascade/memo.h" + namespace oceanbase { + Memo &CascadeTask::get_memo() const {return context_->get_memo(); } RuleSet &CascadeTask::get_rule_set() const { return context_->get_rule_set(); } diff --git a/src/observer/sql/optimizer/cascade/tasks/cascade_task.h b/src/observer/sql/optimizer/cascade/tasks/cascade_task.h index 7ab33042e..aa4640a80 100644 --- a/src/observer/sql/optimizer/cascade/tasks/cascade_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/cascade_task.h @@ -11,7 +11,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/lang/vector.h" + namespace oceanbase { + class Rule; class GroupExpr; class RuleSet; diff --git a/src/observer/sql/optimizer/cascade/tasks/e_group_task.cpp b/src/observer/sql/optimizer/cascade/tasks/e_group_task.cpp index e002f5002..dcc1dc543 100644 --- a/src/observer/sql/optimizer/cascade/tasks/e_group_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/e_group_task.cpp @@ -11,7 +11,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/tasks/e_group_task.h" #include "sql/optimizer/cascade/tasks/o_expr_task.h" #include "common/log/log.h" + namespace oceanbase { + void ExploreGroup::perform() { LOG_TRACE("ExploreGroup::perform() "); diff --git a/src/observer/sql/optimizer/cascade/tasks/e_group_task.h b/src/observer/sql/optimizer/cascade/tasks/e_group_task.h index 68b3b4ed4..594baae47 100644 --- a/src/observer/sql/optimizer/cascade/tasks/e_group_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/e_group_task.h @@ -12,7 +12,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/tasks/cascade_task.h" #include "sql/optimizer/cascade/group.h" + namespace oceanbase { + /** * @brief ExploreGroup */ diff --git a/src/observer/sql/optimizer/cascade/tasks/o_expr_task.cpp b/src/observer/sql/optimizer/cascade/tasks/o_expr_task.cpp index c0d973a81..c7d0cbdb8 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_expr_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/o_expr_task.cpp @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/memo.h" #include "common/log/log.h" #include + namespace oceanbase { + void OptimizeExpression::perform() { std::vector valid_rules; diff --git a/src/observer/sql/optimizer/cascade/tasks/o_expr_task.h b/src/observer/sql/optimizer/cascade/tasks/o_expr_task.h index 83854099d..c84f48f60 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_expr_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/o_expr_task.h @@ -11,7 +11,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/optimizer/cascade/tasks/cascade_task.h" + namespace oceanbase { + /** * OptimizeExpression */ diff --git a/src/observer/sql/optimizer/cascade/tasks/o_group_task.cpp b/src/observer/sql/optimizer/cascade/tasks/o_group_task.cpp index 98150b46b..3590d6d3c 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_group_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/o_group_task.cpp @@ -12,7 +12,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/tasks/o_input_task.h" #include "sql/optimizer/cascade/tasks/o_expr_task.h" #include "sql/optimizer/cascade/optimizer_context.h" + namespace oceanbase { + void OptimizeGroup::perform() { LOG_TRACE("OptimizeGroup::perform() group %d", group_->get_id()); diff --git a/src/observer/sql/optimizer/cascade/tasks/o_group_task.h b/src/observer/sql/optimizer/cascade/tasks/o_group_task.h index 37184fe37..f183e678f 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_group_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/o_group_task.h @@ -12,7 +12,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/tasks/cascade_task.h" #include "sql/optimizer/cascade/group.h" + namespace oceanbase { + /** * @brief: OptimizeGroup, find the best plan for a group */ diff --git a/src/observer/sql/optimizer/cascade/tasks/o_input_task.cpp b/src/observer/sql/optimizer/cascade/tasks/o_input_task.cpp index 653a0e00c..9f8cb337d 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_input_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/o_input_task.cpp @@ -14,7 +14,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/group_expr.h" #include "sql/optimizer/cascade/memo.h" #include "common/log/log.h" + namespace oceanbase { + void OptimizeInputs::perform() { LOG_TRACE("OptimizeInputs::perform()"); diff --git a/src/observer/sql/optimizer/cascade/tasks/o_input_task.h b/src/observer/sql/optimizer/cascade/tasks/o_input_task.h index d0e93bb58..8637d127e 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_input_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/o_input_task.h @@ -12,7 +12,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/cascade/tasks/cascade_task.h" #include "sql/optimizer/cascade/property_set.h" + namespace oceanbase { + /** * OptimizeInputs */ diff --git a/src/observer/sql/optimizer/comparison_simplification_rule.cpp b/src/observer/sql/optimizer/comparison_simplification_rule.cpp index 34361e0cc..9aaa7e23b 100644 --- a/src/observer/sql/optimizer/comparison_simplification_rule.cpp +++ b/src/observer/sql/optimizer/comparison_simplification_rule.cpp @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/comparison_simplification_rule.h" #include "common/log/log.h" #include "sql/expr/expression.h" + namespace oceanbase { + RC ComparisonSimplificationRule::rewrite(unique_ptr &expr, bool &change_made) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/optimizer/comparison_simplification_rule.h b/src/observer/sql/optimizer/comparison_simplification_rule.h index 7378fb9f8..5f2405a51 100644 --- a/src/observer/sql/optimizer/comparison_simplification_rule.h +++ b/src/observer/sql/optimizer/comparison_simplification_rule.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/optimizer/rewrite_rule.h" + namespace oceanbase { + class LogicalOperator; /** diff --git a/src/observer/sql/optimizer/conjunction_simplification_rule.cpp b/src/observer/sql/optimizer/conjunction_simplification_rule.cpp index 07be951ce..ce3357a94 100644 --- a/src/observer/sql/optimizer/conjunction_simplification_rule.cpp +++ b/src/observer/sql/optimizer/conjunction_simplification_rule.cpp @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/conjunction_simplification_rule.h" #include "common/log/log.h" #include "sql/expr/expression.h" + namespace oceanbase { + RC try_to_get_bool_constant(unique_ptr &expr, bool &constant_value) { if (expr->type() == ExprType::VALUE && expr->value_type() == AttrType::BOOLEANS) { diff --git a/src/observer/sql/optimizer/conjunction_simplification_rule.h b/src/observer/sql/optimizer/conjunction_simplification_rule.h index 0ae9c4100..c68a0cfa9 100644 --- a/src/observer/sql/optimizer/conjunction_simplification_rule.h +++ b/src/observer/sql/optimizer/conjunction_simplification_rule.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/optimizer/rewrite_rule.h" + namespace oceanbase { + class LogicalOperator; /** diff --git a/src/observer/sql/optimizer/expression_rewriter.cpp b/src/observer/sql/optimizer/expression_rewriter.cpp index 66c14865d..59f201891 100644 --- a/src/observer/sql/optimizer/expression_rewriter.cpp +++ b/src/observer/sql/optimizer/expression_rewriter.cpp @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/conjunction_simplification_rule.h" using namespace std; + namespace oceanbase { + ExpressionRewriter::ExpressionRewriter() { expr_rewrite_rules_.emplace_back(new ComparisonSimplificationRule); diff --git a/src/observer/sql/optimizer/expression_rewriter.h b/src/observer/sql/optimizer/expression_rewriter.h index 2cf4dada1..c60a8a723 100644 --- a/src/observer/sql/optimizer/expression_rewriter.h +++ b/src/observer/sql/optimizer/expression_rewriter.h @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "sql/operator/logical_operator.h" #include "sql/optimizer/rewrite_rule.h" + namespace oceanbase { + class ExpressionRewriter : public RewriteRule { public: diff --git a/src/observer/sql/optimizer/logical_plan_generator.cpp b/src/observer/sql/optimizer/logical_plan_generator.cpp index 43a03da03..fe32c20e6 100644 --- a/src/observer/sql/optimizer/logical_plan_generator.cpp +++ b/src/observer/sql/optimizer/logical_plan_generator.cpp @@ -39,7 +39,9 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; + namespace oceanbase { + RC LogicalPlanGenerator::create(Stmt *stmt, unique_ptr &logical_operator) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/optimizer/logical_plan_generator.h b/src/observer/sql/optimizer/logical_plan_generator.h index c3318fc12..8684267e1 100644 --- a/src/observer/sql/optimizer/logical_plan_generator.h +++ b/src/observer/sql/optimizer/logical_plan_generator.h @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/memory.h" #include "common/sys/rc.h" #include "common/type/attr_type.h" + namespace oceanbase { + class Stmt; class CalcStmt; class SelectStmt; diff --git a/src/observer/sql/optimizer/optimize_stage.cpp b/src/observer/sql/optimizer/optimize_stage.cpp index 59933ac11..2b773d7aa 100644 --- a/src/observer/sql/optimizer/optimize_stage.cpp +++ b/src/observer/sql/optimizer/optimize_stage.cpp @@ -29,7 +29,9 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; + namespace oceanbase { + RC OptimizeStage::handle_request(SQLStageEvent *sql_event) { unique_ptr logical_operator; diff --git a/src/observer/sql/optimizer/optimize_stage.h b/src/observer/sql/optimizer/optimize_stage.h index bc199be9b..787e13f0c 100644 --- a/src/observer/sql/optimizer/optimize_stage.h +++ b/src/observer/sql/optimizer/optimize_stage.h @@ -21,7 +21,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/logical_plan_generator.h" #include "sql/optimizer/physical_plan_generator.h" #include "sql/optimizer/rewriter.h" + namespace oceanbase { + class SQLStageEvent; class LogicalOperator; class Stmt; diff --git a/src/observer/sql/optimizer/optimizer_utils.cpp b/src/observer/sql/optimizer/optimizer_utils.cpp index 39126a05e..dabcc3598 100644 --- a/src/observer/sql/optimizer/optimizer_utils.cpp +++ b/src/observer/sql/optimizer/optimizer_utils.cpp @@ -9,7 +9,9 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "sql/optimizer/optimizer_utils.h" + namespace oceanbase { + string OptimizerUtils::dump_physical_plan(const unique_ptr& children) { std::function &)> to_string = [&]( diff --git a/src/observer/sql/optimizer/optimizer_utils.h b/src/observer/sql/optimizer/optimizer_utils.h index 8c7427e67..140b32cfc 100644 --- a/src/observer/sql/optimizer/optimizer_utils.h +++ b/src/observer/sql/optimizer/optimizer_utils.h @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "common/lang/memory.h" #include "sql/operator/physical_operator.h" + namespace oceanbase { + class OptimizerUtils { public: diff --git a/src/observer/sql/optimizer/physical_plan_generator.cpp b/src/observer/sql/optimizer/physical_plan_generator.cpp index 25c25f1bd..2519c23ca 100644 --- a/src/observer/sql/optimizer/physical_plan_generator.cpp +++ b/src/observer/sql/optimizer/physical_plan_generator.cpp @@ -45,7 +45,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/physical_plan_generator.h" using namespace std; + namespace oceanbase { + RC PhysicalPlanGenerator::create(LogicalOperator &logical_operator, unique_ptr &oper, Session* session) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/optimizer/physical_plan_generator.h b/src/observer/sql/optimizer/physical_plan_generator.h index 439c38d9d..d3c3f675e 100644 --- a/src/observer/sql/optimizer/physical_plan_generator.h +++ b/src/observer/sql/optimizer/physical_plan_generator.h @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/operator/logical_operator.h" #include "sql/operator/physical_operator.h" + namespace oceanbase { + class Session; class TableGetLogicalOperator; class PredicateLogicalOperator; diff --git a/src/observer/sql/optimizer/predicate_pushdown_rewriter.cpp b/src/observer/sql/optimizer/predicate_pushdown_rewriter.cpp index 8facd8e51..b648cb7ad 100644 --- a/src/observer/sql/optimizer/predicate_pushdown_rewriter.cpp +++ b/src/observer/sql/optimizer/predicate_pushdown_rewriter.cpp @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "sql/operator/logical_operator.h" #include "sql/operator/table_get_logical_operator.h" + namespace oceanbase { + RC PredicatePushdownRewriter::rewrite(unique_ptr &oper, bool &change_made) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/optimizer/predicate_pushdown_rewriter.h b/src/observer/sql/optimizer/predicate_pushdown_rewriter.h index 60e63d9d9..b844853d6 100644 --- a/src/observer/sql/optimizer/predicate_pushdown_rewriter.h +++ b/src/observer/sql/optimizer/predicate_pushdown_rewriter.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/vector.h" #include "sql/optimizer/rewrite_rule.h" + namespace oceanbase { + /** * @brief 将一些谓词表达式下推到表数据扫描中 * @ingroup Rewriter diff --git a/src/observer/sql/optimizer/predicate_rewrite.cpp b/src/observer/sql/optimizer/predicate_rewrite.cpp index bf834a8f8..68c0b8a00 100644 --- a/src/observer/sql/optimizer/predicate_rewrite.cpp +++ b/src/observer/sql/optimizer/predicate_rewrite.cpp @@ -14,7 +14,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/predicate_rewrite.h" #include "sql/operator/logical_operator.h" + namespace oceanbase { + RC PredicateRewriteRule::rewrite(unique_ptr &oper, bool &change_made) { vector> &child_opers = oper->children(); diff --git a/src/observer/sql/optimizer/predicate_rewrite.h b/src/observer/sql/optimizer/predicate_rewrite.h index af4e3fd60..3a851df49 100644 --- a/src/observer/sql/optimizer/predicate_rewrite.h +++ b/src/observer/sql/optimizer/predicate_rewrite.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/optimizer/rewrite_rule.h" + namespace oceanbase { + /** * @brief 谓词重写规则 * @ingroup Rewriter diff --git a/src/observer/sql/optimizer/predicate_to_join_rule.h b/src/observer/sql/optimizer/predicate_to_join_rule.h index 208bf02e9..243d492b8 100644 --- a/src/observer/sql/optimizer/predicate_to_join_rule.h +++ b/src/observer/sql/optimizer/predicate_to_join_rule.h @@ -12,7 +12,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/vector.h" #include "sql/optimizer/rewrite_rule.h" + namespace oceanbase { + /** * @brief 将一些谓词表达式下推到join中 * @ingroup Rewriter diff --git a/src/observer/sql/optimizer/rewrite_rule.h b/src/observer/sql/optimizer/rewrite_rule.h index afae1bcc3..90061d063 100644 --- a/src/observer/sql/optimizer/rewrite_rule.h +++ b/src/observer/sql/optimizer/rewrite_rule.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "common/lang/memory.h" + namespace oceanbase { + class LogicalOperator; class Expression; diff --git a/src/observer/sql/optimizer/rewriter.cpp b/src/observer/sql/optimizer/rewriter.cpp index d910da083..0db3b79ca 100644 --- a/src/observer/sql/optimizer/rewriter.cpp +++ b/src/observer/sql/optimizer/rewriter.cpp @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/expression_rewriter.h" #include "sql/optimizer/predicate_pushdown_rewriter.h" #include "sql/optimizer/predicate_rewrite.h" + namespace oceanbase { + Rewriter::Rewriter() { rewrite_rules_.emplace_back(new ExpressionRewriter); diff --git a/src/observer/sql/optimizer/rewriter.h b/src/observer/sql/optimizer/rewriter.h index 2ab029f32..e2253217d 100644 --- a/src/observer/sql/optimizer/rewriter.h +++ b/src/observer/sql/optimizer/rewriter.h @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/optimizer/rewrite_rule.h" #include "common/lang/memory.h" #include "common/lang/vector.h" + namespace oceanbase { + class LogicalOperator; /** diff --git a/src/observer/sql/optimizer/statistics/table_statistics.h b/src/observer/sql/optimizer/statistics/table_statistics.h index af19f6db4..94c939bda 100644 --- a/src/observer/sql/optimizer/statistics/table_statistics.h +++ b/src/observer/sql/optimizer/statistics/table_statistics.h @@ -9,7 +9,9 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #pragma once + namespace oceanbase { + class TableStatistics {}; } \ No newline at end of file diff --git a/src/observer/sql/parser/expression_binder.cpp b/src/observer/sql/parser/expression_binder.cpp index 97439ee67..4a58f8b91 100644 --- a/src/observer/sql/parser/expression_binder.cpp +++ b/src/observer/sql/parser/expression_binder.cpp @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression_iterator.h" using namespace common; + namespace oceanbase { + Table *BinderContext::find_table(const char *table_name) const { auto pred = [table_name](Table *table) { return 0 == strcasecmp(table_name, table->name()); }; diff --git a/src/observer/sql/parser/expression_binder.h b/src/observer/sql/parser/expression_binder.h index 101363e14..84cbce6c7 100644 --- a/src/observer/sql/parser/expression_binder.h +++ b/src/observer/sql/parser/expression_binder.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/expr/expression.h" + namespace oceanbase { + class BinderContext { public: diff --git a/src/observer/sql/parser/parse.cpp b/src/observer/sql/parser/parse.cpp index 91f8eb989..b163e5449 100644 --- a/src/observer/sql/parser/parse.cpp +++ b/src/observer/sql/parser/parse.cpp @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse.h" #include "common/log/log.h" #include "sql/expr/expression.h" + namespace oceanbase { + RC parse(char *st, ParsedSqlNode *sqln); ParsedSqlNode::ParsedSqlNode() : flag(SCF_ERROR) {} diff --git a/src/observer/sql/parser/parse.h b/src/observer/sql/parser/parse.h index 1db0a7c76..3c99a892d 100644 --- a/src/observer/sql/parser/parse.h +++ b/src/observer/sql/parser/parse.h @@ -16,6 +16,8 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/parser/parse_defs.h" + namespace oceanbase { + RC parse(const char *st, ParsedSqlResult *sql_result); } \ No newline at end of file diff --git a/src/observer/sql/parser/parse_defs.h b/src/observer/sql/parser/parse_defs.h index 83d1480f2..5b04eb4b4 100644 --- a/src/observer/sql/parser/parse_defs.h +++ b/src/observer/sql/parser/parse_defs.h @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/memory.h" #include "common/value.h" #include "common/lang/utility.h" + namespace oceanbase { + class Expression; /** diff --git a/src/observer/sql/parser/parse_stage.cpp b/src/observer/sql/parser/parse_stage.cpp index c527453b1..698ff7ae1 100644 --- a/src/observer/sql/parser/parse_stage.cpp +++ b/src/observer/sql/parser/parse_stage.cpp @@ -25,7 +25,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse.h" using namespace common; + namespace oceanbase { + RC ParseStage::handle_request(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/parser/parse_stage.h b/src/observer/sql/parser/parse_stage.h index 09b93440b..b0ef49be3 100644 --- a/src/observer/sql/parser/parse_stage.h +++ b/src/observer/sql/parser/parse_stage.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" + namespace oceanbase { + class SQLStageEvent; /** diff --git a/src/observer/sql/parser/resolve_stage.cpp b/src/observer/sql/parser/resolve_stage.cpp index 0bb0e489c..944f00c1a 100644 --- a/src/observer/sql/parser/resolve_stage.cpp +++ b/src/observer/sql/parser/resolve_stage.cpp @@ -26,7 +26,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/stmt.h" using namespace common; + namespace oceanbase { + RC ResolveStage::handle_request(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/parser/resolve_stage.h b/src/observer/sql/parser/resolve_stage.h index c33c80415..735b8ba96 100644 --- a/src/observer/sql/parser/resolve_stage.h +++ b/src/observer/sql/parser/resolve_stage.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" + namespace oceanbase { + class SQLStageEvent; /** diff --git a/src/observer/sql/plan_cache/plan_cache_stage.h b/src/observer/sql/plan_cache/plan_cache_stage.h index 1efef17ec..b21ba221f 100644 --- a/src/observer/sql/plan_cache/plan_cache_stage.h +++ b/src/observer/sql/plan_cache/plan_cache_stage.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" + namespace oceanbase { + /** * @brief 尝试从Plan的缓存中获取Plan，如果没有命中，则执行Optimizer * @ingroup SQLStage diff --git a/src/observer/sql/query_cache/query_cache_stage.cpp b/src/observer/sql/query_cache/query_cache_stage.cpp index 4c23ecdb2..7615ec201 100644 --- a/src/observer/sql/query_cache/query_cache_stage.cpp +++ b/src/observer/sql/query_cache/query_cache_stage.cpp @@ -22,7 +22,9 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" using namespace common; + namespace oceanbase { + RC QueryCacheStage::handle_request(SQLStageEvent *sql_event) { return RC::SUCCESS; diff --git a/src/observer/sql/query_cache/query_cache_stage.h b/src/observer/sql/query_cache/query_cache_stage.h index 8bb4caac9..e261e7c4c 100644 --- a/src/observer/sql/query_cache/query_cache_stage.h +++ b/src/observer/sql/query_cache/query_cache_stage.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" + namespace oceanbase { + class SQLStageEvent; /** diff --git a/src/observer/sql/stmt/analyze_table_stmt.cpp b/src/observer/sql/stmt/analyze_table_stmt.cpp index f31cf8326..be595a7ff 100644 --- a/src/observer/sql/stmt/analyze_table_stmt.cpp +++ b/src/observer/sql/stmt/analyze_table_stmt.cpp @@ -10,7 +10,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/analyze_table_stmt.h" #include "storage/db/db.h" + namespace oceanbase { + RC AnalyzeTableStmt::create(Db *db, const AnalyzeTableSqlNode &analyze_table, Stmt *&stmt) { if (db->find_table(analyze_table.relation_name.c_str()) == nullptr) { diff --git a/src/observer/sql/stmt/analyze_table_stmt.h b/src/observer/sql/stmt/analyze_table_stmt.h index ca044f99b..ca809e81d 100644 --- a/src/observer/sql/stmt/analyze_table_stmt.h +++ b/src/observer/sql/stmt/analyze_table_stmt.h @@ -11,7 +11,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/stmt/stmt.h" + namespace oceanbase { + class Db; /** diff --git a/src/observer/sql/stmt/calc_stmt.h b/src/observer/sql/stmt/calc_stmt.h index 74ba30296..dd136df04 100644 --- a/src/observer/sql/stmt/calc_stmt.h +++ b/src/observer/sql/stmt/calc_stmt.h @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/expr/expression.h" #include "sql/stmt/stmt.h" + namespace oceanbase { + class Db; class Table; diff --git a/src/observer/sql/stmt/create_index_stmt.cpp b/src/observer/sql/stmt/create_index_stmt.cpp index a0c764f68..d69dfebe5 100644 --- a/src/observer/sql/stmt/create_index_stmt.cpp +++ b/src/observer/sql/stmt/create_index_stmt.cpp @@ -20,7 +20,9 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; + namespace oceanbase { + RC CreateIndexStmt::create(Db *db, const CreateIndexSqlNode &create_index, Stmt *&stmt) { stmt = nullptr; diff --git a/src/observer/sql/stmt/create_index_stmt.h b/src/observer/sql/stmt/create_index_stmt.h index 07e38d70d..9fa6076c9 100644 --- a/src/observer/sql/stmt/create_index_stmt.h +++ b/src/observer/sql/stmt/create_index_stmt.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/stmt/stmt.h" + namespace oceanbase { + struct CreateIndexSqlNode; class Table; class FieldMeta; diff --git a/src/observer/sql/stmt/create_table_stmt.cpp b/src/observer/sql/stmt/create_table_stmt.cpp index e8b0bc92e..793848055 100644 --- a/src/observer/sql/stmt/create_table_stmt.cpp +++ b/src/observer/sql/stmt/create_table_stmt.cpp @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/types.h" #include "sql/stmt/create_table_stmt.h" #include "event/sql_debug.h" + namespace oceanbase { + RC CreateTableStmt::create(Db *db, const CreateTableSqlNode &create_table, Stmt *&stmt) { StorageFormat storage_format = get_storage_format(create_table.storage_format.c_str()); diff --git a/src/observer/sql/stmt/create_table_stmt.h b/src/observer/sql/stmt/create_table_stmt.h index d3090739e..8468ba962 100644 --- a/src/observer/sql/stmt/create_table_stmt.h +++ b/src/observer/sql/stmt/create_table_stmt.h @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "common/lang/vector.h" #include "sql/stmt/stmt.h" + namespace oceanbase { + class Db; /** diff --git a/src/observer/sql/stmt/delete_stmt.cpp b/src/observer/sql/stmt/delete_stmt.cpp index aca53d261..9c10fbf16 100644 --- a/src/observer/sql/stmt/delete_stmt.cpp +++ b/src/observer/sql/stmt/delete_stmt.cpp @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/filter_stmt.h" #include "storage/db/db.h" #include "storage/table/table.h" + namespace oceanbase { + DeleteStmt::DeleteStmt(Table *table, FilterStmt *filter_stmt) : table_(table), filter_stmt_(filter_stmt) {} DeleteStmt::~DeleteStmt() diff --git a/src/observer/sql/stmt/delete_stmt.h b/src/observer/sql/stmt/delete_stmt.h index 4f86807dd..7718d1882 100644 --- a/src/observer/sql/stmt/delete_stmt.h +++ b/src/observer/sql/stmt/delete_stmt.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse_defs.h" #include "sql/stmt/stmt.h" + namespace oceanbase { + class Table; class FilterStmt; diff --git a/src/observer/sql/stmt/desc_table_stmt.cpp b/src/observer/sql/stmt/desc_table_stmt.cpp index 1cf4b1229..d7c813a67 100644 --- a/src/observer/sql/stmt/desc_table_stmt.cpp +++ b/src/observer/sql/stmt/desc_table_stmt.cpp @@ -14,7 +14,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/desc_table_stmt.h" #include "storage/db/db.h" + namespace oceanbase { + RC DescTableStmt::create(Db *db, const DescTableSqlNode &desc_table, Stmt *&stmt) { if (db->find_table(desc_table.relation_name.c_str()) == nullptr) { diff --git a/src/observer/sql/stmt/desc_table_stmt.h b/src/observer/sql/stmt/desc_table_stmt.h index 3561c0a70..155c72ddf 100644 --- a/src/observer/sql/stmt/desc_table_stmt.h +++ b/src/observer/sql/stmt/desc_table_stmt.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/stmt/stmt.h" + namespace oceanbase { + class Db; /** diff --git a/src/observer/sql/stmt/exit_stmt.h b/src/observer/sql/stmt/exit_stmt.h index f69df7951..9f2709623 100644 --- a/src/observer/sql/stmt/exit_stmt.h +++ b/src/observer/sql/stmt/exit_stmt.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/stmt/stmt.h" + namespace oceanbase { + /** * @brief Exit 语句，表示断开连接，现在什么成员都没有 * @ingroup Statement diff --git a/src/observer/sql/stmt/explain_stmt.cpp b/src/observer/sql/stmt/explain_stmt.cpp index 9baad91ca..39454e5e0 100644 --- a/src/observer/sql/stmt/explain_stmt.cpp +++ b/src/observer/sql/stmt/explain_stmt.cpp @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/explain_stmt.h" #include "common/log/log.h" #include "sql/stmt/stmt.h" + namespace oceanbase { + ExplainStmt::ExplainStmt(unique_ptr child_stmt) : child_stmt_(std::move(child_stmt)) {} RC ExplainStmt::create(Db *db, const ExplainSqlNode &explain, Stmt *&stmt) diff --git a/src/observer/sql/stmt/explain_stmt.h b/src/observer/sql/stmt/explain_stmt.h index 1d9c21b55..c8180f12b 100644 --- a/src/observer/sql/stmt/explain_stmt.h +++ b/src/observer/sql/stmt/explain_stmt.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/stmt/stmt.h" + namespace oceanbase { + /** * @brief explain语句 * @ingroup Statement diff --git a/src/observer/sql/stmt/filter_stmt.cpp b/src/observer/sql/stmt/filter_stmt.cpp index 72c3aeec9..74d8c44f2 100644 --- a/src/observer/sql/stmt/filter_stmt.cpp +++ b/src/observer/sql/stmt/filter_stmt.cpp @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "storage/db/db.h" #include "storage/table/table.h" + namespace oceanbase { + FilterStmt::~FilterStmt() { for (FilterUnit *unit : filter_units_) { diff --git a/src/observer/sql/stmt/filter_stmt.h b/src/observer/sql/stmt/filter_stmt.h index 6bc8dadfc..e5e52e7ab 100644 --- a/src/observer/sql/stmt/filter_stmt.h +++ b/src/observer/sql/stmt/filter_stmt.h @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/expr/expression.h" #include "sql/parser/parse_defs.h" #include "sql/stmt/stmt.h" + namespace oceanbase { + class Db; class Table; class FieldMeta; diff --git a/src/observer/sql/stmt/help_stmt.h b/src/observer/sql/stmt/help_stmt.h index a23dafc09..4fd2c30b6 100644 --- a/src/observer/sql/stmt/help_stmt.h +++ b/src/observer/sql/stmt/help_stmt.h @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include #include "sql/stmt/stmt.h" + namespace oceanbase { + /** * @brief Help 语句，现在什么成员都没有 * @ingroup Statement diff --git a/src/observer/sql/stmt/insert_stmt.cpp b/src/observer/sql/stmt/insert_stmt.cpp index b1f4e1fc5..032918a65 100644 --- a/src/observer/sql/stmt/insert_stmt.cpp +++ b/src/observer/sql/stmt/insert_stmt.cpp @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "storage/db/db.h" #include "storage/table/table.h" + namespace oceanbase { + InsertStmt::InsertStmt(Table *table, const Value *values, int value_amount) : table_(table), values_(values), value_amount_(value_amount) {} diff --git a/src/observer/sql/stmt/insert_stmt.h b/src/observer/sql/stmt/insert_stmt.h index 3dc7f24ed..54fa2700d 100644 --- a/src/observer/sql/stmt/insert_stmt.h +++ b/src/observer/sql/stmt/insert_stmt.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/stmt/stmt.h" + namespace oceanbase { + class Table; class Db; diff --git a/src/observer/sql/stmt/load_data_stmt.cpp b/src/observer/sql/stmt/load_data_stmt.cpp index 9a0b4877c..ca1ef4c32 100644 --- a/src/observer/sql/stmt/load_data_stmt.cpp +++ b/src/observer/sql/stmt/load_data_stmt.cpp @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ #include using namespace common; + namespace oceanbase { + RC LoadDataStmt::create(Db *db, const LoadDataSqlNode &load_data, Stmt *&stmt) { RC rc = RC::SUCCESS; diff --git a/src/observer/sql/stmt/load_data_stmt.h b/src/observer/sql/stmt/load_data_stmt.h index 3b44722ed..e5435e89f 100644 --- a/src/observer/sql/stmt/load_data_stmt.h +++ b/src/observer/sql/stmt/load_data_stmt.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/stmt/stmt.h" + namespace oceanbase { + class Table; class LoadDataStmt : public Stmt diff --git a/src/observer/sql/stmt/select_stmt.cpp b/src/observer/sql/stmt/select_stmt.cpp index 017e25753..f2c201dc5 100644 --- a/src/observer/sql/stmt/select_stmt.cpp +++ b/src/observer/sql/stmt/select_stmt.cpp @@ -22,7 +22,9 @@ See the Mulan PSL v2 for more details. */ using namespace std; using namespace common; + namespace oceanbase { + SelectStmt::~SelectStmt() { if (nullptr != filter_stmt_) { diff --git a/src/observer/sql/stmt/select_stmt.h b/src/observer/sql/stmt/select_stmt.h index c26bc6453..fc4170c66 100644 --- a/src/observer/sql/stmt/select_stmt.h +++ b/src/observer/sql/stmt/select_stmt.h @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/stmt/stmt.h" #include "storage/field/field.h" + namespace oceanbase { + class FieldMeta; class FilterStmt; class Db; diff --git a/src/observer/sql/stmt/set_variable_stmt.h b/src/observer/sql/stmt/set_variable_stmt.h index 19e858846..5605abec9 100644 --- a/src/observer/sql/stmt/set_variable_stmt.h +++ b/src/observer/sql/stmt/set_variable_stmt.h @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include #include "sql/stmt/stmt.h" + namespace oceanbase { + /** * @brief SetVairable 语句，设置变量，当前是会话变量，但是只有会话变量，没有全局变量 * @ingroup Statement diff --git a/src/observer/sql/stmt/show_tables_stmt.h b/src/observer/sql/stmt/show_tables_stmt.h index d20b3c64d..4a8ef0130 100644 --- a/src/observer/sql/stmt/show_tables_stmt.h +++ b/src/observer/sql/stmt/show_tables_stmt.h @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include #include "sql/stmt/stmt.h" + namespace oceanbase { + class Db; /** diff --git a/src/observer/sql/stmt/stmt.cpp b/src/observer/sql/stmt/stmt.cpp index 4cad0c5fa..5eefacddf 100644 --- a/src/observer/sql/stmt/stmt.cpp +++ b/src/observer/sql/stmt/stmt.cpp @@ -30,7 +30,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/stmt/show_tables_stmt.h" #include "sql/stmt/trx_begin_stmt.h" #include "sql/stmt/trx_end_stmt.h" + namespace oceanbase { + bool stmt_type_ddl(StmtType type) { switch (type) { diff --git a/src/observer/sql/stmt/stmt.h b/src/observer/sql/stmt/stmt.h index 06842d0f4..5ba81cec9 100644 --- a/src/observer/sql/stmt/stmt.h +++ b/src/observer/sql/stmt/stmt.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/parser/parse_defs.h" + namespace oceanbase { + class Db; /** diff --git a/src/observer/sql/stmt/trx_begin_stmt.h b/src/observer/sql/stmt/trx_begin_stmt.h index a43ff4d2c..12cbc6dde 100644 --- a/src/observer/sql/stmt/trx_begin_stmt.h +++ b/src/observer/sql/stmt/trx_begin_stmt.h @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include #include "sql/stmt/stmt.h" + namespace oceanbase { + /** * @brief 事务的Begin 语句，现在什么成员都没有 * @ingroup Statement diff --git a/src/observer/sql/stmt/trx_end_stmt.h b/src/observer/sql/stmt/trx_end_stmt.h index 4cc159e18..9f73b0f9d 100644 --- a/src/observer/sql/stmt/trx_end_stmt.h +++ b/src/observer/sql/stmt/trx_end_stmt.h @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include #include "sql/stmt/stmt.h" + namespace oceanbase { + /** * @brief 事务的 Commit/Rollback 语句，现在什么成员都没有 * @ingroup Statement diff --git a/src/observer/sql/stmt/update_stmt.cpp b/src/observer/sql/stmt/update_stmt.cpp index be1538bc5..c3dd9bb5c 100644 --- a/src/observer/sql/stmt/update_stmt.cpp +++ b/src/observer/sql/stmt/update_stmt.cpp @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ // #include "sql/stmt/update_stmt.h" + namespace oceanbase { + UpdateStmt::UpdateStmt(Table *table, Value *values, int value_amount) : table_(table), values_(values), value_amount_(value_amount) {} diff --git a/src/observer/sql/stmt/update_stmt.h b/src/observer/sql/stmt/update_stmt.h index 32bad8063..36b39ebb9 100644 --- a/src/observer/sql/stmt/update_stmt.h +++ b/src/observer/sql/stmt/update_stmt.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "sql/stmt/stmt.h" + namespace oceanbase { + class Table; /** diff --git a/src/observer/storage/buffer/buffer_pool_log.cpp b/src/observer/storage/buffer/buffer_pool_log.cpp index 48db6177c..9176aab9c 100644 --- a/src/observer/storage/buffer/buffer_pool_log.cpp +++ b/src/observer/storage/buffer/buffer_pool_log.cpp @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/buffer/disk_buffer_pool.h" #include "storage/clog/log_handler.h" #include "storage/clog/log_entry.h" + namespace oceanbase { + string BufferPoolLogEntry::to_string() const { return string("buffer_pool_id=") + std::to_string(buffer_pool_id) + diff --git a/src/observer/storage/buffer/buffer_pool_log.h b/src/observer/storage/buffer/buffer_pool_log.h index d006e0d55..57d80f444 100644 --- a/src/observer/storage/buffer/buffer_pool_log.h +++ b/src/observer/storage/buffer/buffer_pool_log.h @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include "common/types.h" #include "common/sys/rc.h" #include "storage/clog/log_replayer.h" + namespace oceanbase { + class DiskBufferPool; class BufferPoolManager; class LogHandler; diff --git a/src/observer/storage/buffer/disk_buffer_pool.cpp b/src/observer/storage/buffer/disk_buffer_pool.cpp index 29c2d09ca..5138c8d04 100644 --- a/src/observer/storage/buffer/disk_buffer_pool.cpp +++ b/src/observer/storage/buffer/disk_buffer_pool.cpp @@ -24,7 +24,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/db/db.h" using namespace common; + namespace oceanbase { + static const int MEM_POOL_ITEM_NUM = 20; //////////////////////////////////////////////////////////////////////////////// diff --git a/src/observer/storage/buffer/disk_buffer_pool.h b/src/observer/storage/buffer/disk_buffer_pool.h index d7f6ffce6..cb12ea88b 100644 --- a/src/observer/storage/buffer/disk_buffer_pool.h +++ b/src/observer/storage/buffer/disk_buffer_pool.h @@ -36,7 +36,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/buffer/frame.h" #include "storage/buffer/page.h" #include "storage/buffer/buffer_pool_log.h" + namespace oceanbase { + class BufferPoolManager; class DiskBufferPool; class DoubleWriteBuffer; diff --git a/src/observer/storage/buffer/double_write_buffer.cpp b/src/observer/storage/buffer/double_write_buffer.cpp index 1dfa38c0e..690e7e8e0 100644 --- a/src/observer/storage/buffer/double_write_buffer.cpp +++ b/src/observer/storage/buffer/double_write_buffer.cpp @@ -21,7 +21,9 @@ See the Mulan PSL v2 for more details. */ #include using namespace common; + namespace oceanbase { + struct DoubleWritePage { public: diff --git a/src/observer/storage/buffer/double_write_buffer.h b/src/observer/storage/buffer/double_write_buffer.h index facc93315..7a28e2f6e 100644 --- a/src/observer/storage/buffer/double_write_buffer.h +++ b/src/observer/storage/buffer/double_write_buffer.h @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ #include "common/types.h" #include "common/sys/rc.h" #include "storage/buffer/page.h" + namespace oceanbase { + class DiskBufferPool; struct DoubleWritePage; class BufferPoolManager; diff --git a/src/observer/storage/buffer/frame.cpp b/src/observer/storage/buffer/frame.cpp index f33b3b617..1866c0aeb 100644 --- a/src/observer/storage/buffer/frame.cpp +++ b/src/observer/storage/buffer/frame.cpp @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/buffer/frame.h" #include "session/session.h" #include "session/thread_data.h" + namespace oceanbase { + FrameId::FrameId(int buffer_pool_id, PageNum page_num) : buffer_pool_id_(buffer_pool_id), page_num_(page_num) {} bool FrameId::equal_to(const FrameId &other) const diff --git a/src/observer/storage/buffer/frame.h b/src/observer/storage/buffer/frame.h index bc68f032b..e2ae5657e 100644 --- a/src/observer/storage/buffer/frame.h +++ b/src/observer/storage/buffer/frame.h @@ -24,7 +24,9 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "common/types.h" #include "storage/buffer/page.h" + namespace oceanbase { + /** * @brief 页帧标识符 * @ingroup BufferPool diff --git a/src/observer/storage/buffer/page.h b/src/observer/storage/buffer/page.h index 92ffcdf7d..d3d8e27d9 100644 --- a/src/observer/storage/buffer/page.h +++ b/src/observer/storage/buffer/page.h @@ -25,7 +25,9 @@ static constexpr PageNum BP_HEADER_PAGE = 0; static constexpr const int BP_PAGE_SIZE = (1 << 13); static constexpr const int BP_PAGE_DATA_SIZE = (BP_PAGE_SIZE - sizeof(LSN) - sizeof(CheckSum)); + namespace oceanbase { + /** * @brief 表示一个页面，可能放在内存或磁盘上 * @ingroup BufferPool diff --git a/src/observer/storage/clog/disk_log_handler.cpp b/src/observer/storage/clog/disk_log_handler.cpp index 675785747..375c9a2a2 100644 --- a/src/observer/storage/clog/disk_log_handler.cpp +++ b/src/observer/storage/clog/disk_log_handler.cpp @@ -22,7 +22,9 @@ using namespace common; //////////////////////////////////////////////////////////////////////////////// // LogHandler + namespace oceanbase { + RC DiskLogHandler::init(const char *path) { const int max_entry_number_per_file = 1000; diff --git a/src/observer/storage/clog/disk_log_handler.h b/src/observer/storage/clog/disk_log_handler.h index 058cf194c..514fb26b9 100644 --- a/src/observer/storage/clog/disk_log_handler.h +++ b/src/observer/storage/clog/disk_log_handler.h @@ -24,7 +24,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/clog/log_file.h" #include "storage/clog/log_buffer.h" #include "storage/clog/log_handler.h" + namespace oceanbase { + class LogReplayer; /** diff --git a/src/observer/storage/clog/integrated_log_replayer.cpp b/src/observer/storage/clog/integrated_log_replayer.cpp index 68e734c88..facccc4bd 100644 --- a/src/observer/storage/clog/integrated_log_replayer.cpp +++ b/src/observer/storage/clog/integrated_log_replayer.cpp @@ -14,7 +14,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/clog/integrated_log_replayer.h" #include "storage/clog/log_entry.h" + namespace oceanbase { + IntegratedLogReplayer::IntegratedLogReplayer(BufferPoolManager &bpm) : buffer_pool_log_replayer_(bpm), record_log_replayer_(bpm), diff --git a/src/observer/storage/clog/integrated_log_replayer.h b/src/observer/storage/clog/integrated_log_replayer.h index aa4ac626d..a94442bb1 100644 --- a/src/observer/storage/clog/integrated_log_replayer.h +++ b/src/observer/storage/clog/integrated_log_replayer.h @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record_log.h" #include "storage/index/bplus_tree_log.h" #include "storage/trx/mvcc_trx_log.h" + namespace oceanbase { + class BufferPoolManager; /** diff --git a/src/observer/storage/clog/log_buffer.cpp b/src/observer/storage/clog/log_buffer.cpp index c83f484b4..57b141d85 100644 --- a/src/observer/storage/clog/log_buffer.cpp +++ b/src/observer/storage/clog/log_buffer.cpp @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/chrono.h" using namespace common; + namespace oceanbase { + RC LogEntryBuffer::init(LSN lsn, int32_t max_bytes /*= 0*/) { current_lsn_.store(lsn); diff --git a/src/observer/storage/clog/log_buffer.h b/src/observer/storage/clog/log_buffer.h index ce1ad1fc3..db1ba42d3 100644 --- a/src/observer/storage/clog/log_buffer.h +++ b/src/observer/storage/clog/log_buffer.h @@ -22,7 +22,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/atomic.h" #include "storage/clog/log_module.h" #include "storage/clog/log_entry.h" + namespace oceanbase { + class LogFileWriter; /** diff --git a/src/observer/storage/clog/log_entry.cpp b/src/observer/storage/clog/log_entry.cpp index 99bd76270..c3cdf5313 100644 --- a/src/observer/storage/clog/log_entry.cpp +++ b/src/observer/storage/clog/log_entry.cpp @@ -14,7 +14,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/clog/log_entry.h" #include "common/log/log.h" + namespace oceanbase { + //////////////////////////////////////////////////////////////////////////////// // struct LogHeader diff --git a/src/observer/storage/clog/log_entry.h b/src/observer/storage/clog/log_entry.h index 30429239b..7557aa947 100644 --- a/src/observer/storage/clog/log_entry.h +++ b/src/observer/storage/clog/log_entry.h @@ -20,7 +20,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/vector.h" #include "common/lang/string.h" #include "common/lang/memory.h" + namespace oceanbase { + /** * @brief 描述一条日志头 * @ingroup CLog diff --git a/src/observer/storage/clog/log_file.cpp b/src/observer/storage/clog/log_file.cpp index c5f1bff7e..1b985bda6 100644 --- a/src/observer/storage/clog/log_file.cpp +++ b/src/observer/storage/clog/log_file.cpp @@ -22,7 +22,9 @@ See the Mulan PSL v2 for more details. */ #include "common/io/io.h" using namespace common; + namespace oceanbase { + RC LogFileReader::open(const char *filename) { filename_ = filename; diff --git a/src/observer/storage/clog/log_file.h b/src/observer/storage/clog/log_file.h index ef285045b..4ea268475 100644 --- a/src/observer/storage/clog/log_file.h +++ b/src/observer/storage/clog/log_file.h @@ -21,7 +21,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/filesystem.h" #include "common/lang/fstream.h" #include "common/lang/string.h" + namespace oceanbase { + class LogEntry; /** diff --git a/src/observer/storage/clog/log_handler.cpp b/src/observer/storage/clog/log_handler.cpp index 7c86195a3..d9dd2fe05 100644 --- a/src/observer/storage/clog/log_handler.cpp +++ b/src/observer/storage/clog/log_handler.cpp @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "storage/clog/disk_log_handler.h" #include "storage/clog/vacuous_log_handler.h" + namespace oceanbase { + RC LogHandler::append(LSN &lsn, LogModule::Id module, span data) { vector data_vec(data.begin(), data.end()); diff --git a/src/observer/storage/clog/log_handler.h b/src/observer/storage/clog/log_handler.h index bbc118f8a..8e9fb862b 100644 --- a/src/observer/storage/clog/log_handler.h +++ b/src/observer/storage/clog/log_handler.h @@ -21,7 +21,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/span.h" #include "common/lang/vector.h" #include "storage/clog/log_module.h" + namespace oceanbase { + /** * @defgroup CLog commit log/redo log */ diff --git a/src/observer/storage/clog/log_module.h b/src/observer/storage/clog/log_module.h index b18f6cf0d..c357c3981 100644 --- a/src/observer/storage/clog/log_module.h +++ b/src/observer/storage/clog/log_module.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include + namespace oceanbase { + /** * @brief 日志模块 * @ingroup CLog diff --git a/src/observer/storage/clog/log_replayer.h b/src/observer/storage/clog/log_replayer.h index 4474e5a9c..403d1cd94 100644 --- a/src/observer/storage/clog/log_replayer.h +++ b/src/observer/storage/clog/log_replayer.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/sys/rc.h" + namespace oceanbase { + class LogEntry; /** diff --git a/src/observer/storage/clog/vacuous_log_handler.h b/src/observer/storage/clog/vacuous_log_handler.h index 20dacf4d0..1c31db71d 100644 --- a/src/observer/storage/clog/vacuous_log_handler.h +++ b/src/observer/storage/clog/vacuous_log_handler.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "storage/clog/log_handler.h" + namespace oceanbase { + /** * @brief VacuousLogHandler is a log handler implenmentation that do nothing in all methods. * It is used for testing. diff --git a/src/observer/storage/common/arena_allocator.cpp b/src/observer/storage/common/arena_allocator.cpp index 4e46f3b72..a55688378 100644 --- a/src/observer/storage/common/arena_allocator.cpp +++ b/src/observer/storage/common/arena_allocator.cpp @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ // found in the LICENSE file. See the AUTHORS file for names of contributors. #include "storage/common/arena_allocator.h" + namespace oceanbase { + static const int kBlockSize = 4096; Arena::Arena() diff --git a/src/observer/storage/common/arena_allocator.h b/src/observer/storage/common/arena_allocator.h index 5734d5db6..6e43926bb 100644 --- a/src/observer/storage/common/arena_allocator.h +++ b/src/observer/storage/common/arena_allocator.h @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ #include #include #include + namespace oceanbase { + class Arena { public: diff --git a/src/observer/storage/common/chunk.cpp b/src/observer/storage/common/chunk.cpp index ee00cdc6e..858f0cfe8 100644 --- a/src/observer/storage/common/chunk.cpp +++ b/src/observer/storage/common/chunk.cpp @@ -9,7 +9,9 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "storage/common/chunk.h" + namespace oceanbase { + void Chunk::add_column(unique_ptr col, int col_id) { columns_.push_back(std::move(col)); diff --git a/src/observer/storage/common/chunk.h b/src/observer/storage/common/chunk.h index 3658baa65..0b85714a9 100644 --- a/src/observer/storage/common/chunk.h +++ b/src/observer/storage/common/chunk.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/memory.h" #include "common/lang/vector.h" #include "storage/common/column.h" + namespace oceanbase { + /** * @brief A Chunk represents a set of columns. */ diff --git a/src/observer/storage/common/codec.h b/src/observer/storage/common/codec.h index ea137b2f5..a1f8fcd30 100644 --- a/src/observer/storage/common/codec.h +++ b/src/observer/storage/common/codec.h @@ -23,7 +23,9 @@ See the Mulan PSL v2 for more details. */ using byte_t = unsigned char; using bytes = vector; using float64_t = double_t; + namespace oceanbase { + // reference: https://github.com/code0xff/orderedcodepp class OrderedCode { diff --git a/src/observer/storage/common/column.cpp b/src/observer/storage/common/column.cpp index 8c12cc506..0a91ef3d8 100644 --- a/src/observer/storage/common/column.cpp +++ b/src/observer/storage/common/column.cpp @@ -10,7 +10,9 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "storage/common/column.h" + namespace oceanbase { + Column::Column(const FieldMeta &meta, size_t size) : data_(nullptr), count_(0), diff --git a/src/observer/storage/common/column.h b/src/observer/storage/common/column.h index dee43925c..372aa26c9 100644 --- a/src/observer/storage/common/column.h +++ b/src/observer/storage/common/column.h @@ -14,7 +14,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field_meta.h" #include "storage/common/vector_buffer.h" + namespace oceanbase { + /** * @brief A column contains multiple values in contiguous memory with a specified type. */ diff --git a/src/observer/storage/common/condition_filter.cpp b/src/observer/storage/common/condition_filter.cpp index ec6a28d37..9e415ebd9 100644 --- a/src/observer/storage/common/condition_filter.cpp +++ b/src/observer/storage/common/condition_filter.cpp @@ -21,7 +21,9 @@ See the Mulan PSL v2 for more details. */ #include using namespace common; + namespace oceanbase { + ConditionFilter::~ConditionFilter() {} DefaultConditionFilter::DefaultConditionFilter() diff --git a/src/observer/storage/common/condition_filter.h b/src/observer/storage/common/condition_filter.h index 6f2af7dc2..993fd808b 100644 --- a/src/observer/storage/common/condition_filter.h +++ b/src/observer/storage/common/condition_filter.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "sql/parser/parse.h" + namespace oceanbase { + class Record; class Table; diff --git a/src/observer/storage/common/meta_util.cpp b/src/observer/storage/common/meta_util.cpp index 802db5cdf..35f03396a 100644 --- a/src/observer/storage/common/meta_util.cpp +++ b/src/observer/storage/common/meta_util.cpp @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/common/meta_util.h" #include "common/lang/filesystem.h" + namespace oceanbase { + string db_meta_file(const char *base_dir, const char *db_name) { filesystem::path db_dir = filesystem::path(base_dir); diff --git a/src/observer/storage/common/meta_util.h b/src/observer/storage/common/meta_util.h index f54c4d897..719437792 100644 --- a/src/observer/storage/common/meta_util.h +++ b/src/observer/storage/common/meta_util.h @@ -14,7 +14,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "common/lang/string.h" + namespace oceanbase { + static constexpr const char *DB_META_SUFFIX = ".db"; static constexpr const char *TABLE_META_SUFFIX = ".table"; static constexpr const char *TABLE_META_FILE_PATTERN = ".*\\.table$"; diff --git a/src/observer/storage/common/vector_buffer.h b/src/observer/storage/common/vector_buffer.h index b8abaccd8..618c8c745 100644 --- a/src/observer/storage/common/vector_buffer.h +++ b/src/observer/storage/common/vector_buffer.h @@ -3,7 +3,9 @@ #include "storage/common/arena_allocator.h" #include "common/type/string_t.h" #include "common/log/log.h" + namespace oceanbase { + class VectorBuffer { public: diff --git a/src/observer/storage/db/db.cpp b/src/observer/storage/db/db.cpp index f39b5f3db..ed0f85b9f 100644 --- a/src/observer/storage/db/db.cpp +++ b/src/observer/storage/db/db.cpp @@ -29,7 +29,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/clog/integrated_log_replayer.h" using namespace common; + namespace oceanbase { + Db::~Db() { for (auto &iter : opened_tables_) { diff --git a/src/observer/storage/db/db.h b/src/observer/storage/db/db.h index 02c682aa6..2906c5cd6 100644 --- a/src/observer/storage/db/db.h +++ b/src/observer/storage/db/db.h @@ -25,7 +25,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/clog/disk_log_handler.h" #include "storage/buffer/double_write_buffer.h" #include "oblsm/include/ob_lsm.h" + namespace oceanbase { + class Table; class LogHandler; class BufferPoolManager; diff --git a/src/observer/storage/default/default_handler.cpp b/src/observer/storage/default/default_handler.cpp index 68351ed30..e5b095b7b 100644 --- a/src/observer/storage/default/default_handler.cpp +++ b/src/observer/storage/default/default_handler.cpp @@ -25,7 +25,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/trx/trx.h" using namespace std; + namespace oceanbase { + DefaultHandler::DefaultHandler() {} DefaultHandler::~DefaultHandler() noexcept { destroy(); } diff --git a/src/observer/storage/default/default_handler.h b/src/observer/storage/default/default_handler.h index 249aea258..130f3f1a8 100644 --- a/src/observer/storage/default/default_handler.h +++ b/src/observer/storage/default/default_handler.h @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/map.h" #include "common/lang/string.h" #include "common/lang/memory.h" + namespace oceanbase { + class Trx; class TrxKit; diff --git a/src/observer/storage/field/field.cpp b/src/observer/storage/field/field.cpp index 2dade4c95..5b4534ed2 100644 --- a/src/observer/storage/field/field.cpp +++ b/src/observer/storage/field/field.cpp @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "common/value.h" #include "storage/record/record.h" + namespace oceanbase { + void Field::set_int(Record &record, int value) { ASSERT(field_->type() == AttrType::INTS, "could not set int value to a non-int field"); diff --git a/src/observer/storage/field/field.h b/src/observer/storage/field/field.h index 18828bc6b..ba587f1c7 100644 --- a/src/observer/storage/field/field.h +++ b/src/observer/storage/field/field.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field_meta.h" #include "storage/table/table.h" + namespace oceanbase { + /** * @brief 字段 * diff --git a/src/observer/storage/field/field_meta.cpp b/src/observer/storage/field/field_meta.cpp index f3c99908b..b42a9db1e 100644 --- a/src/observer/storage/field/field_meta.cpp +++ b/src/observer/storage/field/field_meta.cpp @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include "sql/parser/parse_defs.h" #include "json/json.h" + namespace oceanbase { + const static Json::StaticString FIELD_NAME("name"); const static Json::StaticString FIELD_TYPE("type"); const static Json::StaticString FIELD_OFFSET("offset"); diff --git a/src/observer/storage/field/field_meta.h b/src/observer/storage/field/field_meta.h index 1a8e6c367..50245997b 100644 --- a/src/observer/storage/field/field_meta.h +++ b/src/observer/storage/field/field_meta.h @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "common/lang/string.h" #include "sql/parser/parse_defs.h" + namespace oceanbase { + namespace Json { class Value; } // namespace Json diff --git a/src/observer/storage/index/bplus_tree.cpp b/src/observer/storage/index/bplus_tree.cpp index 9fe4bd190..cae7500b8 100644 --- a/src/observer/storage/index/bplus_tree.cpp +++ b/src/observer/storage/index/bplus_tree.cpp @@ -21,7 +21,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/buffer/disk_buffer_pool.h" using namespace common; + namespace oceanbase { + /** * @brief B+树的第一个页面存放的位置 * @details B+树数据放到Buffer Pool中，Buffer Pool把文件按照固定大小的页面拆分。 diff --git a/src/observer/storage/index/bplus_tree.h b/src/observer/storage/index/bplus_tree.h index 95214f820..cda1c0a13 100644 --- a/src/observer/storage/index/bplus_tree.h +++ b/src/observer/storage/index/bplus_tree.h @@ -29,7 +29,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record_manager.h" #include "storage/index/latch_memo.h" #include "storage/index/bplus_tree_log.h" + namespace oceanbase { + class BplusTreeHandler; class BplusTreeMiniTransaction; diff --git a/src/observer/storage/index/bplus_tree_index.cpp b/src/observer/storage/index/bplus_tree_index.cpp index 33578c6fb..e562f4c24 100644 --- a/src/observer/storage/index/bplus_tree_index.cpp +++ b/src/observer/storage/index/bplus_tree_index.cpp @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "storage/table/table.h" #include "storage/db/db.h" + namespace oceanbase { + BplusTreeIndex::~BplusTreeIndex() noexcept { close(); } RC BplusTreeIndex::create(Table *table, const char *file_name, const IndexMeta &index_meta, const FieldMeta &field_meta) diff --git a/src/observer/storage/index/bplus_tree_index.h b/src/observer/storage/index/bplus_tree_index.h index 9251104c6..566ac7250 100644 --- a/src/observer/storage/index/bplus_tree_index.h +++ b/src/observer/storage/index/bplus_tree_index.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/index/bplus_tree.h" #include "storage/index/index.h" + namespace oceanbase { + /** * @brief B+树索引 * @ingroup Index diff --git a/src/observer/storage/index/bplus_tree_log.cpp b/src/observer/storage/index/bplus_tree_log.cpp index 6169818ec..61409e72f 100644 --- a/src/observer/storage/index/bplus_tree_log.cpp +++ b/src/observer/storage/index/bplus_tree_log.cpp @@ -26,7 +26,9 @@ See the Mulan PSL v2 for more details. */ using namespace common; using namespace bplus_tree; + namespace oceanbase { + /////////////////////////////////////////////////////////////////////////////// // class BplusTreeLogger BplusTreeLogger::BplusTreeLogger(LogHandler &log_handler, int32_t buffer_pool_id) diff --git a/src/observer/storage/index/bplus_tree_log.h b/src/observer/storage/index/bplus_tree_log.h index b25bd5cd2..bbc6b95cb 100644 --- a/src/observer/storage/index/bplus_tree_log.h +++ b/src/observer/storage/index/bplus_tree_log.h @@ -25,7 +25,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/index/latch_memo.h" #include "storage/clog/log_replayer.h" // #include "storage/index/bplus_tree_log_entry.h" + namespace oceanbase { + struct IndexFileHeader; class LogEntry; class LogHandler; diff --git a/src/observer/storage/index/bplus_tree_log_entry.cpp b/src/observer/storage/index/bplus_tree_log_entry.cpp index f1b75e8f0..ca05db3af 100644 --- a/src/observer/storage/index/bplus_tree_log_entry.cpp +++ b/src/observer/storage/index/bplus_tree_log_entry.cpp @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/serializer.h" using namespace common; + namespace oceanbase { + namespace bplus_tree { string LogOperation::to_string() const diff --git a/src/observer/storage/index/bplus_tree_log_entry.h b/src/observer/storage/index/bplus_tree_log_entry.h index efb5e1c36..c79c815b6 100644 --- a/src/observer/storage/index/bplus_tree_log_entry.h +++ b/src/observer/storage/index/bplus_tree_log_entry.h @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/span.h" #include "common/lang/string.h" #include "storage/index/bplus_tree.h" + namespace oceanbase { + class IndexNodeHandler; class BplusTreeHandler; class BplusTreeMiniTransaction; diff --git a/src/observer/storage/index/index.cpp b/src/observer/storage/index/index.cpp index 0c5e05168..b71011130 100644 --- a/src/observer/storage/index/index.cpp +++ b/src/observer/storage/index/index.cpp @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ // #include "storage/index/index.h" + namespace oceanbase { + RC Index::init(const IndexMeta &index_meta, const FieldMeta &field_meta) { index_meta_ = index_meta; diff --git a/src/observer/storage/index/index.h b/src/observer/storage/index/index.h index 29d300748..8ee0d060e 100644 --- a/src/observer/storage/index/index.h +++ b/src/observer/storage/index/index.h @@ -21,7 +21,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field_meta.h" #include "storage/index/index_meta.h" #include "storage/record/record_manager.h" + namespace oceanbase { + class IndexScanner; /** diff --git a/src/observer/storage/index/index_meta.cpp b/src/observer/storage/index/index_meta.cpp index d3ea8cc73..dfa5755e5 100644 --- a/src/observer/storage/index/index_meta.cpp +++ b/src/observer/storage/index/index_meta.cpp @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field_meta.h" #include "storage/table/table_meta.h" #include "json/json.h" + namespace oceanbase { + const static Json::StaticString FIELD_NAME("name"); const static Json::StaticString FIELD_FIELD_NAME("field_name"); diff --git a/src/observer/storage/index/index_meta.h b/src/observer/storage/index/index_meta.h index 6d62062a3..b879ad08e 100644 --- a/src/observer/storage/index/index_meta.h +++ b/src/observer/storage/index/index_meta.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "common/lang/string.h" + namespace oceanbase { + class TableMeta; class FieldMeta; diff --git a/src/observer/storage/index/ivfflat_index.h b/src/observer/storage/index/ivfflat_index.h index dc3859550..65446fde1 100644 --- a/src/observer/storage/index/ivfflat_index.h +++ b/src/observer/storage/index/ivfflat_index.h @@ -11,7 +11,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "storage/index/index.h" + namespace oceanbase { + /** * @brief ivfflat 向量索引 * @ingroup Index diff --git a/src/observer/storage/index/latch_memo.cpp b/src/observer/storage/index/latch_memo.cpp index 41404f6e8..32548932a 100644 --- a/src/observer/storage/index/latch_memo.cpp +++ b/src/observer/storage/index/latch_memo.cpp @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/mutex.h" #include "storage/buffer/disk_buffer_pool.h" #include "storage/buffer/frame.h" + namespace oceanbase { + LatchMemoItem::LatchMemoItem(LatchMemoType type, Frame *frame) { this->type = type; diff --git a/src/observer/storage/index/latch_memo.h b/src/observer/storage/index/latch_memo.h index d8e136138..ef27e71e8 100644 --- a/src/observer/storage/index/latch_memo.h +++ b/src/observer/storage/index/latch_memo.h @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/deque.h" #include "common/lang/vector.h" #include "storage/buffer/page.h" + namespace oceanbase { + class Frame; class DiskBufferPool; diff --git a/src/observer/storage/persist/persist.cpp b/src/observer/storage/persist/persist.cpp index e35d5730a..a424ad7a1 100644 --- a/src/observer/storage/persist/persist.cpp +++ b/src/observer/storage/persist/persist.cpp @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "common/log/log.h" #include "persist.h" + namespace oceanbase { + PersistHandler::PersistHandler() {} PersistHandler::~PersistHandler() { close_file(); } diff --git a/src/observer/storage/persist/persist.h b/src/observer/storage/persist/persist.h index dca07b419..894709da8 100644 --- a/src/observer/storage/persist/persist.h +++ b/src/observer/storage/persist/persist.h @@ -23,7 +23,9 @@ See the Mulan PSL v2 for more details. */ #include "common/sys/rc.h" #include "common/lang/string.h" + namespace oceanbase { + class PersistHandler { public: diff --git a/src/observer/storage/record/heap_record_scanner.cpp b/src/observer/storage/record/heap_record_scanner.cpp index 6c511aac4..34245cdbd 100644 --- a/src/observer/storage/record/heap_record_scanner.cpp +++ b/src/observer/storage/record/heap_record_scanner.cpp @@ -11,8 +11,10 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/heap_record_scanner.h" //////////////////////////////////////////////////////////////////////////////// + namespace oceanbase { + RC HeapRecordScanner::open_scan() { ASSERT(disk_buffer_pool_ != nullptr, "disk buffer pool is null"); diff --git a/src/observer/storage/record/heap_record_scanner.h b/src/observer/storage/record/heap_record_scanner.h index 769536f90..7109b9b0c 100644 --- a/src/observer/storage/record/heap_record_scanner.h +++ b/src/observer/storage/record/heap_record_scanner.h @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record_scanner.h" #include "storage/buffer/disk_buffer_pool.h" #include "storage/trx/trx.h" + namespace oceanbase { + /** * @brief 遍历某个文件中所有记录 * @ingroup RecordManager diff --git a/src/observer/storage/record/lob_handler.cpp b/src/observer/storage/record/lob_handler.cpp index 22e897f78..3f1c9f45b 100644 --- a/src/observer/storage/record/lob_handler.cpp +++ b/src/observer/storage/record/lob_handler.cpp @@ -9,7 +9,9 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "storage/record/lob_handler.h" + namespace oceanbase { + RC LobFileHandler::create_file(const char *file_name) { return file_.create_file(file_name); diff --git a/src/observer/storage/record/lob_handler.h b/src/observer/storage/record/lob_handler.h index baa4128c9..9db8ca728 100644 --- a/src/observer/storage/record/lob_handler.h +++ b/src/observer/storage/record/lob_handler.h @@ -14,7 +14,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/sstream.h" #include "common/types.h" #include "storage/persist/persist.h" + namespace oceanbase { + /** * @brief 管理LOB文件中的 LOB 对象 * @ingroup RecordManager diff --git a/src/observer/storage/record/lsm_record_scanner.cpp b/src/observer/storage/record/lsm_record_scanner.cpp index 11b1b9a42..a85f28bd1 100644 --- a/src/observer/storage/record/lsm_record_scanner.cpp +++ b/src/observer/storage/record/lsm_record_scanner.cpp @@ -11,7 +11,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/lsm_record_scanner.h" #include "storage/common/codec.h" #include "storage/trx/lsm_mvcc_trx.h" + namespace oceanbase { + RC LsmRecordScanner::open_scan() { RC rc = RC::SUCCESS; diff --git a/src/observer/storage/record/lsm_record_scanner.h b/src/observer/storage/record/lsm_record_scanner.h index c3089117c..fa6dcd369 100644 --- a/src/observer/storage/record/lsm_record_scanner.h +++ b/src/observer/storage/record/lsm_record_scanner.h @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/trx/trx.h" using namespace oceanbase; + namespace oceanbase { + class LsmRecordScanner : public RecordScanner { public: diff --git a/src/observer/storage/record/record.h b/src/observer/storage/record/record.h index 7f5041ff3..0c2c665ff 100644 --- a/src/observer/storage/record/record.h +++ b/src/observer/storage/record/record.h @@ -24,7 +24,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/limits.h" #include "storage/field/field_meta.h" #include "storage/index/index_meta.h" + namespace oceanbase { + class Field; /** diff --git a/src/observer/storage/record/record_log.cpp b/src/observer/storage/record/record_log.cpp index bc2b7fee7..81ce82be4 100644 --- a/src/observer/storage/record/record_log.cpp +++ b/src/observer/storage/record/record_log.cpp @@ -28,7 +28,9 @@ See the Mulan PSL v2 for more details. */ using namespace common; // class RecordOperation + namespace oceanbase { + string RecordOperation::to_string() const { string ret = std::to_string(type_id()) + ":"; diff --git a/src/observer/storage/record/record_log.h b/src/observer/storage/record/record_log.h index 333d07ef1..c006623d4 100644 --- a/src/observer/storage/record/record_log.h +++ b/src/observer/storage/record/record_log.h @@ -22,7 +22,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/string.h" #include "storage/clog/log_replayer.h" #include "sql/parser/parse_defs.h" + namespace oceanbase { + struct RID; class LogHandler; class Frame; diff --git a/src/observer/storage/record/record_manager.cpp b/src/observer/storage/record/record_manager.cpp index 48947504d..8522481ee 100644 --- a/src/observer/storage/record/record_manager.cpp +++ b/src/observer/storage/record/record_manager.cpp @@ -18,7 +18,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/clog/log_handler.h" using namespace common; + namespace oceanbase { + static constexpr int PAGE_HEADER_SIZE = (sizeof(PageHeader)); RecordPageHandler *RecordPageHandler::create(StorageFormat format) { diff --git a/src/observer/storage/record/record_manager.h b/src/observer/storage/record/record_manager.h index 2ec0d46fb..337b6ac4f 100644 --- a/src/observer/storage/record/record_manager.h +++ b/src/observer/storage/record/record_manager.h @@ -22,7 +22,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record_log.h" #include "storage/record/lob_handler.h" #include "common/types.h" + namespace oceanbase { + class LogHandler; class ConditionFilter; class RecordPageHandler; diff --git a/src/observer/storage/record/record_scanner.h b/src/observer/storage/record/record_scanner.h index 12c510dda..312b3cc66 100644 --- a/src/observer/storage/record/record_scanner.h +++ b/src/observer/storage/record/record_scanner.h @@ -12,7 +12,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/record.h" #include "storage/common/condition_filter.h" + namespace oceanbase { + /** * @brief 遍历某个表中所有记录 * @ingroup RecordManager diff --git a/src/observer/storage/table/heap_table_engine.cpp b/src/observer/storage/table/heap_table_engine.cpp index ca2dc0687..75b469548 100644 --- a/src/observer/storage/table/heap_table_engine.cpp +++ b/src/observer/storage/table/heap_table_engine.cpp @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/common/meta_util.h" #include "storage/db/db.h" + namespace oceanbase { + HeapTableEngine::~HeapTableEngine() { if (record_handler_ != nullptr) { diff --git a/src/observer/storage/table/heap_table_engine.h b/src/observer/storage/table/heap_table_engine.h index e4b613e6d..00fe5a9c8 100644 --- a/src/observer/storage/table/heap_table_engine.h +++ b/src/observer/storage/table/heap_table_engine.h @@ -14,7 +14,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/index/index.h" #include "storage/record/record_manager.h" #include "storage/db/db.h" + namespace oceanbase { + class Table; /** * @brief table engine diff --git a/src/observer/storage/table/lsm_table_engine.cpp b/src/observer/storage/table/lsm_table_engine.cpp index 381e75567..a47a6b2e5 100644 --- a/src/observer/storage/table/lsm_table_engine.cpp +++ b/src/observer/storage/table/lsm_table_engine.cpp @@ -18,8 +18,10 @@ See the Mulan PSL v2 for more details. */ #include "storage/common/codec.h" #include "storage/trx/lsm_mvcc_trx.h" + namespace oceanbase { + RC LsmTableEngine::insert_record(Record &record) { RC rc = RC::SUCCESS; diff --git a/src/observer/storage/table/lsm_table_engine.h b/src/observer/storage/table/lsm_table_engine.h index 6edc2b32d..6daf16029 100644 --- a/src/observer/storage/table/lsm_table_engine.h +++ b/src/observer/storage/table/lsm_table_engine.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/db/db.h" #include "oblsm/include/ob_lsm.h" using namespace oceanbase; + namespace oceanbase { + /** * @brief lsm table engine */ diff --git a/src/observer/storage/table/table.cpp b/src/observer/storage/table/table.cpp index cc07e8621..0e2704a15 100644 --- a/src/observer/storage/table/table.cpp +++ b/src/observer/storage/table/table.cpp @@ -34,7 +34,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/record/lsm_record_scanner.h" #include "storage/table/heap_table_engine.h" #include "storage/table/lsm_table_engine.h" + namespace oceanbase { + Table::~Table() { if (lob_handler_ != nullptr) { diff --git a/src/observer/storage/table/table.h b/src/observer/storage/table/table.h index 2deffe804..5552de7e8 100644 --- a/src/observer/storage/table/table.h +++ b/src/observer/storage/table/table.h @@ -21,7 +21,9 @@ See the Mulan PSL v2 for more details. */ #include "common/types.h" #include "common/lang/span.h" #include "common/lang/functional.h" + namespace oceanbase { + struct RID; class Record; class DiskBufferPool; diff --git a/src/observer/storage/table/table_engine.h b/src/observer/storage/table/table_engine.h index bce35217e..fce75a54c 100644 --- a/src/observer/storage/table/table_engine.h +++ b/src/observer/storage/table/table_engine.h @@ -14,7 +14,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/functional.h" #include "storage/table/table_meta.h" #include "storage/common/chunk.h" + namespace oceanbase { + struct RID; class Record; class DiskBufferPool; diff --git a/src/observer/storage/table/table_meta.cpp b/src/observer/storage/table/table_meta.cpp index 2d2dcc49d..5e91d5624 100644 --- a/src/observer/storage/table/table_meta.cpp +++ b/src/observer/storage/table/table_meta.cpp @@ -19,7 +19,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table_meta.h" #include "storage/trx/trx.h" #include "json/json.h" + namespace oceanbase { + static const Json::StaticString FIELD_TABLE_ID("table_id"); static const Json::StaticString FIELD_TABLE_NAME("table_name"); static const Json::StaticString FIELD_STORAGE_FORMAT("storage_format"); diff --git a/src/observer/storage/table/table_meta.h b/src/observer/storage/table/table_meta.h index 089b05269..c144e0214 100644 --- a/src/observer/storage/table/table_meta.h +++ b/src/observer/storage/table/table_meta.h @@ -20,7 +20,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/span.h" #include "storage/field/field_meta.h" #include "storage/index/index_meta.h" + namespace oceanbase { + /** * @brief 表元数据 * diff --git a/src/observer/storage/trx/lsm_mvcc_trx.cpp b/src/observer/storage/trx/lsm_mvcc_trx.cpp index b270641bc..a5b63e914 100644 --- a/src/observer/storage/trx/lsm_mvcc_trx.cpp +++ b/src/observer/storage/trx/lsm_mvcc_trx.cpp @@ -9,7 +9,9 @@ MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ #include "storage/trx/lsm_mvcc_trx.h" + namespace oceanbase { + RC LsmMvccTrxKit::init() { return RC::SUCCESS; } const vector *LsmMvccTrxKit::trx_fields() const { return nullptr; } diff --git a/src/observer/storage/trx/lsm_mvcc_trx.h b/src/observer/storage/trx/lsm_mvcc_trx.h index a8efd90c3..0af9d53de 100644 --- a/src/observer/storage/trx/lsm_mvcc_trx.h +++ b/src/observer/storage/trx/lsm_mvcc_trx.h @@ -16,7 +16,9 @@ See the Mulan PSL v2 for more details. */ #include "oblsm/include/ob_lsm_transaction.h" using namespace oceanbase; + namespace oceanbase { + /** * @brief lsm-tree 存储引擎对应的事务管理器 */ diff --git a/src/observer/storage/trx/mvcc_trx.cpp b/src/observer/storage/trx/mvcc_trx.cpp index 204702765..8ef770ae9 100644 --- a/src/observer/storage/trx/mvcc_trx.cpp +++ b/src/observer/storage/trx/mvcc_trx.cpp @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field.h" #include "storage/trx/mvcc_trx_log.h" #include "common/lang/algorithm.h" + namespace oceanbase { + MvccTrxKit::~MvccTrxKit() { vector tmp_trxes; diff --git a/src/observer/storage/trx/mvcc_trx.h b/src/observer/storage/trx/mvcc_trx.h index fc14c64ae..ac55d8243 100644 --- a/src/observer/storage/trx/mvcc_trx.h +++ b/src/observer/storage/trx/mvcc_trx.h @@ -17,7 +17,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/vector.h" #include "storage/trx/trx.h" #include "storage/trx/mvcc_trx_log.h" + namespace oceanbase { + class CLogManager; class LogHandler; class MvccTrxLogHandler; diff --git a/src/observer/storage/trx/mvcc_trx_log.cpp b/src/observer/storage/trx/mvcc_trx_log.cpp index 59741d669..882b0488e 100644 --- a/src/observer/storage/trx/mvcc_trx_log.cpp +++ b/src/observer/storage/trx/mvcc_trx_log.cpp @@ -22,7 +22,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/table/table.h" using namespace common; + namespace oceanbase { + string MvccTrxLogOperation::to_string() const { string ret = std::to_string(index()) + ":"; diff --git a/src/observer/storage/trx/mvcc_trx_log.h b/src/observer/storage/trx/mvcc_trx_log.h index 49a5065d3..240adcce4 100644 --- a/src/observer/storage/trx/mvcc_trx_log.h +++ b/src/observer/storage/trx/mvcc_trx_log.h @@ -20,7 +20,9 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/unordered_map.h" #include "storage/record/record.h" #include "storage/clog/log_replayer.h" + namespace oceanbase { + class LogHandler; class Table; class Db; diff --git a/src/observer/storage/trx/trx.cpp b/src/observer/storage/trx/trx.cpp index 20b9310be..bc3244b42 100644 --- a/src/observer/storage/trx/trx.cpp +++ b/src/observer/storage/trx/trx.cpp @@ -22,7 +22,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/trx/lsm_mvcc_trx.h" #include "storage/trx/trx.h" #include "storage/trx/vacuous_trx.h" + namespace oceanbase { + TrxKit *TrxKit::create(const char *name, Db* db) { TrxKit *trx_kit = nullptr; diff --git a/src/observer/storage/trx/trx.h b/src/observer/storage/trx/trx.h index cdada3d79..fb0013505 100644 --- a/src/observer/storage/trx/trx.h +++ b/src/observer/storage/trx/trx.h @@ -23,7 +23,9 @@ See the Mulan PSL v2 for more details. */ #include "storage/field/field_meta.h" #include "storage/record/record_manager.h" #include "storage/table/table.h" + namespace oceanbase { + /** * @defgroup Transaction * @brief 事务相关的内容 diff --git a/src/observer/storage/trx/vacuous_trx.cpp b/src/observer/storage/trx/vacuous_trx.cpp index 2c03334a2..aa49df586 100644 --- a/src/observer/storage/trx/vacuous_trx.cpp +++ b/src/observer/storage/trx/vacuous_trx.cpp @@ -13,7 +13,9 @@ See the Mulan PSL v2 for more details. */ // #include "storage/trx/vacuous_trx.h" + namespace oceanbase { + RC VacuousTrxKit::init() { return RC::SUCCESS; } const vector *VacuousTrxKit::trx_fields() const { return nullptr; } diff --git a/src/observer/storage/trx/vacuous_trx.h b/src/observer/storage/trx/vacuous_trx.h index daf3689bc..828c97ec9 100644 --- a/src/observer/storage/trx/vacuous_trx.h +++ b/src/observer/storage/trx/vacuous_trx.h @@ -15,7 +15,9 @@ See the Mulan PSL v2 for more details. */ #pragma once #include "storage/trx/trx.h" + namespace oceanbase { + /** * @brief Vacuous(真空的)，顾名思义就是没有实现事务功能 */ From 892fad05365cfc3cf770be417bbdbb5e49cbc90a Mon Sep 17 00:00:00 2001 From: aradhanahegde Date: Sun, 5 Oct 2025 16:34:15 -0400 Subject: [PATCH 6/7] clang formatted --- src/observer/catalog/catalog.cpp | 2 +- src/observer/catalog/catalog.h | 2 +- src/observer/catalog/table_stats.h | 2 +- src/observer/common/global_context.cpp | 2 +- src/observer/common/global_context.h | 2 +- src/observer/common/ini_setting.h | 2 +- src/observer/common/init.cpp | 15 +- src/observer/common/init.h | 2 +- src/observer/common/type/attr_type.cpp | 13 +- src/observer/common/type/attr_type.h | 2 +- src/observer/common/type/char_type.cpp | 3 +- src/observer/common/type/char_type.h | 2 +- src/observer/common/type/data_type.cpp | 2 +- src/observer/common/type/data_type.h | 2 +- src/observer/common/type/float_type.cpp | 8 +- src/observer/common/type/float_type.h | 2 +- src/observer/common/type/integer_type.cpp | 22 +-- src/observer/common/type/integer_type.h | 2 +- src/observer/common/type/string_t.h | 2 +- src/observer/common/type/vector_type.h | 2 +- src/observer/common/types.h | 2 +- src/observer/common/value.cpp | 13 +- src/observer/common/value.h | 3 +- src/observer/event/session_event.cpp | 2 +- src/observer/event/session_event.h | 2 +- src/observer/event/sql_debug.cpp | 3 +- src/observer/event/sql_debug.h | 2 +- src/observer/event/sql_event.cpp | 2 +- src/observer/event/sql_event.h | 2 +- src/observer/event/storage_event.h | 2 +- src/observer/main.cpp | 3 +- src/observer/net/buffered_writer.cpp | 2 +- src/observer/net/buffered_writer.h | 2 +- src/observer/net/cli_communicator.cpp | 2 +- src/observer/net/cli_communicator.h | 2 +- src/observer/net/communicator.cpp | 2 +- src/observer/net/communicator.h | 2 +- .../net/java_thread_pool_thread_handler.cpp | 38 ++--- .../net/java_thread_pool_thread_handler.h | 2 +- src/observer/net/mysql_communicator.cpp | 54 +++--- src/observer/net/mysql_communicator.h | 2 +- ...e_thread_per_connection_thread_handler.cpp | 22 ++- ...one_thread_per_connection_thread_handler.h | 2 +- src/observer/net/plain_communicator.cpp | 9 +- src/observer/net/plain_communicator.h | 2 +- src/observer/net/ring_buffer.cpp | 6 +- src/observer/net/ring_buffer.h | 2 +- src/observer/net/server.cpp | 2 +- src/observer/net/server.h | 2 +- src/observer/net/server_param.h | 2 +- src/observer/net/sql_task_handler.cpp | 4 +- src/observer/net/sql_task_handler.h | 6 +- src/observer/net/thread_handler.cpp | 4 +- src/observer/net/thread_handler.h | 2 +- src/observer/session/session.cpp | 12 +- src/observer/session/session.h | 2 +- src/observer/session/session_stage.cpp | 2 +- src/observer/session/session_stage.h | 2 +- src/observer/session/thread_data.cpp | 2 +- src/observer/session/thread_data.h | 2 +- .../sql/executor/analyze_table_executor.cpp | 12 +- .../sql/executor/analyze_table_executor.h | 2 +- .../sql/executor/command_executor.cpp | 2 +- src/observer/sql/executor/command_executor.h | 2 +- .../sql/executor/create_index_executor.cpp | 2 +- .../sql/executor/create_index_executor.h | 2 +- .../sql/executor/create_table_executor.cpp | 7 +- .../sql/executor/create_table_executor.h | 2 +- .../sql/executor/desc_table_executor.cpp | 2 +- .../sql/executor/desc_table_executor.h | 2 +- src/observer/sql/executor/execute_stage.cpp | 2 +- src/observer/sql/executor/execute_stage.h | 2 +- src/observer/sql/executor/help_executor.h | 2 +- .../sql/executor/load_data_executor.cpp | 18 +- .../sql/executor/load_data_executor.h | 2 +- .../sql/executor/set_variable_executor.cpp | 156 +++++++++--------- .../sql/executor/set_variable_executor.h | 2 +- .../sql/executor/show_tables_executor.h | 2 +- src/observer/sql/executor/sql_result.cpp | 2 +- src/observer/sql/executor/sql_result.h | 2 +- .../sql/executor/trx_begin_executor.h | 2 +- src/observer/sql/executor/trx_end_executor.h | 2 +- .../sql/expr/aggregate_hash_table.cpp | 41 +++-- src/observer/sql/expr/aggregate_hash_table.h | 2 +- src/observer/sql/expr/aggregate_state.cpp | 34 ++-- src/observer/sql/expr/aggregate_state.h | 2 +- src/observer/sql/expr/aggregator.cpp | 8 +- src/observer/sql/expr/aggregator.h | 2 +- src/observer/sql/expr/composite_tuple.cpp | 8 +- src/observer/sql/expr/composite_tuple.h | 2 +- src/observer/sql/expr/expression.cpp | 24 ++- src/observer/sql/expr/expression.h | 2 +- src/observer/sql/expr/expression_iterator.cpp | 10 +- src/observer/sql/expr/expression_iterator.h | 2 +- src/observer/sql/expr/expression_tuple.h | 2 +- src/observer/sql/expr/tuple.h | 2 +- src/observer/sql/expr/tuple_cell.cpp | 5 +- src/observer/sql/expr/tuple_cell.h | 2 +- .../aggregate_vec_physical_operator.cpp | 14 +- .../aggregate_vec_physical_operator.h | 2 +- .../sql/operator/calc_logical_operator.h | 2 +- .../sql/operator/calc_physical_operator.h | 2 +- .../sql/operator/delete_logical_operator.cpp | 2 +- .../sql/operator/delete_logical_operator.h | 2 +- .../sql/operator/delete_physical_operator.cpp | 12 +- .../sql/operator/delete_physical_operator.h | 2 +- .../sql/operator/explain_logical_operator.h | 2 +- .../operator/explain_physical_operator.cpp | 6 +- .../sql/operator/explain_physical_operator.h | 2 +- .../operator/expr_vec_physical_operator.cpp | 2 +- .../sql/operator/expr_vec_physical_operator.h | 2 +- .../operator/group_by_logical_operator.cpp | 8 +- .../sql/operator/group_by_logical_operator.h | 2 +- .../operator/group_by_physical_operator.cpp | 2 +- .../sql/operator/group_by_physical_operator.h | 2 +- .../operator/group_by_vec_physical_operator.h | 4 +- .../hash_group_by_physical_operator.cpp | 13 +- .../hash_group_by_physical_operator.h | 2 +- .../operator/hash_join_physical_operator.h | 2 +- .../operator/index_scan_physical_operator.cpp | 12 +- .../operator/index_scan_physical_operator.h | 2 +- .../sql/operator/insert_logical_operator.cpp | 5 +- .../sql/operator/insert_logical_operator.h | 2 +- .../sql/operator/insert_physical_operator.cpp | 2 +- .../sql/operator/insert_physical_operator.h | 2 +- .../sql/operator/join_logical_operator.h | 2 +- .../sql/operator/join_physical_operator.cpp | 2 +- .../sql/operator/join_physical_operator.h | 2 +- .../sql/operator/logical_operator.cpp | 23 +-- src/observer/sql/operator/logical_operator.h | 2 +- .../nested_loop_join_physical_operator.cpp | 6 +- .../nested_loop_join_physical_operator.h | 2 +- src/observer/sql/operator/operator_node.h | 2 +- .../sql/operator/physical_operator.cpp | 2 +- src/observer/sql/operator/physical_operator.h | 2 +- .../operator/predicate_logical_operator.cpp | 2 +- .../sql/operator/predicate_logical_operator.h | 2 +- .../operator/predicate_physical_operator.cpp | 7 +- .../operator/predicate_physical_operator.h | 2 +- .../sql/operator/project_logical_operator.cpp | 4 +- .../sql/operator/project_logical_operator.h | 2 +- .../operator/project_physical_operator.cpp | 7 +- .../sql/operator/project_physical_operator.h | 2 +- .../project_vec_physical_operator.cpp | 2 +- .../operator/project_vec_physical_operator.h | 2 +- .../scalar_group_by_physical_operator.cpp | 4 +- .../scalar_group_by_physical_operator.h | 2 +- .../operator/string_list_physical_operator.h | 2 +- .../operator/table_get_logical_operator.cpp | 9 +- .../sql/operator/table_get_logical_operator.h | 2 +- .../operator/table_scan_physical_operator.cpp | 8 +- .../operator/table_scan_physical_operator.h | 2 +- .../table_scan_vec_physical_operator.cpp | 5 +- .../table_scan_vec_physical_operator.h | 2 +- .../sql/optimizer/cascade/cost_model.cpp | 16 +- .../sql/optimizer/cascade/cost_model.h | 4 +- src/observer/sql/optimizer/cascade/group.cpp | 41 +++-- src/observer/sql/optimizer/cascade/group.h | 2 +- .../sql/optimizer/cascade/group_expr.cpp | 5 +- .../sql/optimizer/cascade/group_expr.h | 2 +- .../cascade/implementation_rules.cpp | 108 ++++++------ .../optimizer/cascade/implementation_rules.h | 2 +- src/observer/sql/optimizer/cascade/memo.cpp | 2 +- src/observer/sql/optimizer/cascade/memo.h | 2 +- .../sql/optimizer/cascade/optimizer.cpp | 14 +- .../sql/optimizer/cascade/optimizer.h | 2 +- .../optimizer/cascade/optimizer_context.cpp | 67 ++++---- .../sql/optimizer/cascade/optimizer_context.h | 2 +- src/observer/sql/optimizer/cascade/pattern.h | 2 +- .../sql/optimizer/cascade/pending_tasks.h | 2 +- src/observer/sql/optimizer/cascade/property.h | 2 +- .../sql/optimizer/cascade/property_set.h | 2 +- src/observer/sql/optimizer/cascade/rules.cpp | 2 +- src/observer/sql/optimizer/cascade/rules.h | 2 +- .../cascade/tasks/apply_rule_task.cpp | 8 +- .../optimizer/cascade/tasks/apply_rule_task.h | 2 +- .../optimizer/cascade/tasks/cascade_task.cpp | 4 +- .../optimizer/cascade/tasks/cascade_task.h | 2 +- .../optimizer/cascade/tasks/e_group_task.cpp | 2 +- .../optimizer/cascade/tasks/e_group_task.h | 2 +- .../optimizer/cascade/tasks/o_expr_task.cpp | 2 +- .../sql/optimizer/cascade/tasks/o_expr_task.h | 2 +- .../optimizer/cascade/tasks/o_group_task.cpp | 2 +- .../optimizer/cascade/tasks/o_group_task.h | 2 +- .../optimizer/cascade/tasks/o_input_task.cpp | 21 ++- .../optimizer/cascade/tasks/o_input_task.h | 2 +- .../comparison_simplification_rule.cpp | 2 +- .../comparison_simplification_rule.h | 2 +- .../conjunction_simplification_rule.cpp | 10 +- .../conjunction_simplification_rule.h | 2 +- .../sql/optimizer/expression_rewriter.cpp | 22 +-- .../sql/optimizer/expression_rewriter.h | 2 +- .../sql/optimizer/logical_plan_generator.cpp | 39 ++--- .../sql/optimizer/logical_plan_generator.h | 2 +- src/observer/sql/optimizer/optimize_stage.cpp | 7 +- src/observer/sql/optimizer/optimize_stage.h | 2 +- .../sql/optimizer/optimizer_utils.cpp | 79 +++++---- src/observer/sql/optimizer/optimizer_utils.h | 2 +- .../sql/optimizer/physical_plan_generator.cpp | 64 ++++--- .../sql/optimizer/physical_plan_generator.h | 2 +- .../optimizer/predicate_pushdown_rewriter.cpp | 4 +- .../optimizer/predicate_pushdown_rewriter.h | 2 +- .../sql/optimizer/predicate_rewrite.cpp | 2 +- .../sql/optimizer/predicate_rewrite.h | 2 +- .../sql/optimizer/predicate_to_join_rule.h | 2 +- src/observer/sql/optimizer/rewrite_rule.h | 2 +- src/observer/sql/optimizer/rewriter.cpp | 2 +- src/observer/sql/optimizer/rewriter.h | 2 +- .../optimizer/statistics/table_statistics.h | 2 +- src/observer/sql/parser/expression_binder.cpp | 10 +- src/observer/sql/parser/expression_binder.h | 2 +- src/observer/sql/parser/parse.cpp | 7 +- src/observer/sql/parser/parse_defs.h | 2 +- src/observer/sql/parser/parse_stage.cpp | 4 +- src/observer/sql/parser/parse_stage.h | 2 +- src/observer/sql/parser/resolve_stage.cpp | 2 +- src/observer/sql/parser/resolve_stage.h | 2 +- .../sql/plan_cache/plan_cache_stage.h | 2 +- .../sql/query_cache/query_cache_stage.cpp | 7 +- .../sql/query_cache/query_cache_stage.h | 2 +- src/observer/sql/stmt/analyze_table_stmt.cpp | 2 +- src/observer/sql/stmt/analyze_table_stmt.h | 2 +- src/observer/sql/stmt/calc_stmt.h | 2 +- src/observer/sql/stmt/create_index_stmt.cpp | 2 +- src/observer/sql/stmt/create_index_stmt.h | 2 +- src/observer/sql/stmt/create_table_stmt.cpp | 8 +- src/observer/sql/stmt/create_table_stmt.h | 2 +- src/observer/sql/stmt/delete_stmt.cpp | 2 +- src/observer/sql/stmt/delete_stmt.h | 2 +- src/observer/sql/stmt/desc_table_stmt.cpp | 2 +- src/observer/sql/stmt/desc_table_stmt.h | 2 +- src/observer/sql/stmt/exit_stmt.h | 2 +- src/observer/sql/stmt/explain_stmt.cpp | 4 +- src/observer/sql/stmt/explain_stmt.h | 2 +- src/observer/sql/stmt/filter_stmt.cpp | 6 +- src/observer/sql/stmt/filter_stmt.h | 2 +- src/observer/sql/stmt/help_stmt.h | 2 +- src/observer/sql/stmt/insert_stmt.cpp | 2 +- src/observer/sql/stmt/insert_stmt.h | 2 +- src/observer/sql/stmt/load_data_stmt.cpp | 2 +- src/observer/sql/stmt/load_data_stmt.h | 2 +- src/observer/sql/stmt/select_stmt.cpp | 8 +- src/observer/sql/stmt/select_stmt.h | 2 +- src/observer/sql/stmt/set_variable_stmt.h | 2 +- src/observer/sql/stmt/show_tables_stmt.h | 2 +- src/observer/sql/stmt/stmt.cpp | 4 +- src/observer/sql/stmt/stmt.h | 2 +- src/observer/sql/stmt/trx_begin_stmt.h | 2 +- src/observer/sql/stmt/trx_end_stmt.h | 2 +- src/observer/sql/stmt/update_stmt.cpp | 2 +- src/observer/sql/stmt/update_stmt.h | 2 +- .../storage/buffer/buffer_pool_log.cpp | 35 ++-- src/observer/storage/buffer/buffer_pool_log.h | 2 +- .../storage/buffer/disk_buffer_pool.cpp | 43 ++--- .../storage/buffer/disk_buffer_pool.h | 4 +- .../storage/buffer/double_write_buffer.cpp | 40 ++--- .../storage/buffer/double_write_buffer.h | 2 +- src/observer/storage/buffer/frame.cpp | 58 +++++-- src/observer/storage/buffer/frame.h | 2 +- src/observer/storage/buffer/page.h | 2 +- .../storage/clog/disk_log_handler.cpp | 12 +- src/observer/storage/clog/disk_log_handler.h | 2 +- .../storage/clog/integrated_log_replayer.cpp | 2 +- .../storage/clog/integrated_log_replayer.h | 2 +- src/observer/storage/clog/log_buffer.cpp | 18 +- src/observer/storage/clog/log_buffer.h | 4 +- src/observer/storage/clog/log_entry.cpp | 27 ++- src/observer/storage/clog/log_entry.h | 2 +- src/observer/storage/clog/log_file.cpp | 40 ++--- src/observer/storage/clog/log_file.h | 2 +- src/observer/storage/clog/log_handler.cpp | 2 +- src/observer/storage/clog/log_handler.h | 2 +- src/observer/storage/clog/log_module.h | 2 +- src/observer/storage/clog/log_replayer.h | 2 +- .../storage/clog/vacuous_log_handler.h | 2 +- .../storage/common/arena_allocator.cpp | 39 ++--- src/observer/storage/common/arena_allocator.h | 2 +- src/observer/storage/common/chunk.cpp | 2 +- src/observer/storage/common/chunk.h | 2 +- src/observer/storage/common/codec.cpp | 6 +- src/observer/storage/common/codec.h | 2 +- src/observer/storage/common/column.cpp | 26 +-- src/observer/storage/common/column.h | 2 +- .../storage/common/condition_filter.cpp | 2 +- .../storage/common/condition_filter.h | 2 +- src/observer/storage/common/meta_util.cpp | 2 +- src/observer/storage/common/meta_util.h | 2 +- src/observer/storage/common/vector_buffer.h | 2 +- src/observer/storage/db/db.cpp | 21 ++- src/observer/storage/db/db.h | 2 +- .../storage/default/default_handler.cpp | 17 +- .../storage/default/default_handler.h | 2 +- src/observer/storage/field/field.cpp | 2 +- src/observer/storage/field/field.h | 2 +- src/observer/storage/field/field_meta.cpp | 37 +++-- src/observer/storage/field/field_meta.h | 2 +- src/observer/storage/index/bplus_tree.cpp | 151 ++++++++--------- src/observer/storage/index/bplus_tree.h | 2 +- .../storage/index/bplus_tree_index.cpp | 4 +- src/observer/storage/index/bplus_tree_index.h | 2 +- src/observer/storage/index/bplus_tree_log.cpp | 13 +- src/observer/storage/index/bplus_tree_log.h | 2 +- .../storage/index/bplus_tree_log_entry.cpp | 6 +- .../storage/index/bplus_tree_log_entry.h | 2 +- src/observer/storage/index/index.cpp | 2 +- src/observer/storage/index/index.h | 2 +- src/observer/storage/index/index_meta.cpp | 2 +- src/observer/storage/index/index_meta.h | 2 +- src/observer/storage/index/ivfflat_index.h | 4 +- src/observer/storage/index/latch_memo.cpp | 2 +- src/observer/storage/index/latch_memo.h | 2 +- src/observer/storage/persist/persist.cpp | 2 +- src/observer/storage/persist/persist.h | 2 +- .../storage/record/heap_record_scanner.cpp | 3 +- .../storage/record/heap_record_scanner.h | 4 +- src/observer/storage/record/lob_handler.cpp | 13 +- src/observer/storage/record/lob_handler.h | 2 +- .../storage/record/lsm_record_scanner.cpp | 11 +- .../storage/record/lsm_record_scanner.h | 2 +- src/observer/storage/record/record.h | 2 +- src/observer/storage/record/record_log.cpp | 2 +- src/observer/storage/record/record_log.h | 2 +- .../storage/record/record_manager.cpp | 2 +- src/observer/storage/record/record_manager.h | 20 +-- src/observer/storage/record/record_scanner.h | 2 +- .../storage/table/heap_table_engine.cpp | 9 +- .../storage/table/heap_table_engine.h | 2 +- .../storage/table/lsm_table_engine.cpp | 11 +- src/observer/storage/table/lsm_table_engine.h | 2 +- src/observer/storage/table/table.cpp | 63 +++---- src/observer/storage/table/table.h | 2 +- src/observer/storage/table/table_engine.h | 2 +- src/observer/storage/table/table_meta.cpp | 40 ++--- src/observer/storage/table/table_meta.h | 2 +- src/observer/storage/trx/lsm_mvcc_trx.cpp | 17 +- src/observer/storage/trx/lsm_mvcc_trx.h | 2 +- src/observer/storage/trx/mvcc_trx.cpp | 24 +-- src/observer/storage/trx/mvcc_trx.h | 2 +- src/observer/storage/trx/mvcc_trx_log.cpp | 14 +- src/observer/storage/trx/mvcc_trx_log.h | 2 +- src/observer/storage/trx/trx.cpp | 6 +- src/observer/storage/trx/trx.h | 2 +- src/observer/storage/trx/vacuous_trx.cpp | 2 +- src/observer/storage/trx/vacuous_trx.h | 2 +- 344 files changed, 1264 insertions(+), 1331 deletions(-) diff --git a/src/observer/catalog/catalog.cpp b/src/observer/catalog/catalog.cpp index 0802ac2e6..e47709921 100644 --- a/src/observer/catalog/catalog.cpp +++ b/src/observer/catalog/catalog.cpp @@ -23,4 +23,4 @@ void Catalog::update_table_stats(int table_id, const TableStats &table_stats) lock_guard lock(mutex_); table_stats_[table_id] = table_stats; } -} +} // namespace oceanbase diff --git a/src/observer/catalog/catalog.h b/src/observer/catalog/catalog.h index 60f8d3712..4d488700c 100644 --- a/src/observer/catalog/catalog.h +++ b/src/observer/catalog/catalog.h @@ -74,4 +74,4 @@ class Catalog */ unordered_map table_stats_; ///< Table statistics storage. }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/catalog/table_stats.h b/src/observer/catalog/table_stats.h index dc410e32d..bf4b01bf6 100644 --- a/src/observer/catalog/table_stats.h +++ b/src/observer/catalog/table_stats.h @@ -39,4 +39,4 @@ class TableStats int row_nums = 0; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/common/global_context.cpp b/src/observer/common/global_context.cpp index 9a3cb2d12..3747442c4 100644 --- a/src/observer/common/global_context.cpp +++ b/src/observer/common/global_context.cpp @@ -19,4 +19,4 @@ namespace oceanbase { static GlobalContext global_context; GlobalContext &GlobalContext::instance() { return global_context; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/common/global_context.h b/src/observer/common/global_context.h index 96f50a364..e1be45471 100644 --- a/src/observer/common/global_context.h +++ b/src/observer/common/global_context.h @@ -34,4 +34,4 @@ struct GlobalContext }; #define GCTX GlobalContext::instance() -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/common/ini_setting.h b/src/observer/common/ini_setting.h index a78a9bf10..4ace65cb3 100644 --- a/src/observer/common/ini_setting.h +++ b/src/observer/common/ini_setting.h @@ -27,4 +27,4 @@ namespace oceanbase { #define SOCKET_BUFFER_SIZE 8192 #define SESSION_STAGE_NAME "SessionStage" -} +} // namespace oceanbase diff --git a/src/observer/common/init.cpp b/src/observer/common/init.cpp index aeb4aafb2..52b972b39 100644 --- a/src/observer/common/init.cpp +++ b/src/observer/common/init.cpp @@ -131,10 +131,7 @@ void cleanup_log() } } -int prepare_init_seda() -{ - return 0; -} +int prepare_init_seda() { return 0; } int init_global_objects(ProcessParam *process_param, Ini &properties) { @@ -142,10 +139,10 @@ int init_global_objects(ProcessParam *process_param, Ini &properties) int ret = 0; - RC rc = GCTX.handler_->init("miniob", - process_param->trx_kit_name().c_str(), - process_param->durability_mode().c_str(), - process_param->storage_engine().c_str()); + RC rc = GCTX.handler_->init("miniob", + process_param->trx_kit_name().c_str(), + process_param->durability_mode().c_str(), + process_param->storage_engine().c_str()); if (OB_FAIL(rc)) { LOG_ERROR("failed to init handler. rc=%s", strrc(rc)); return -1; @@ -238,4 +235,4 @@ void cleanup_util() } void cleanup() { cleanup_util(); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/common/init.h b/src/observer/common/init.h index a15341b96..9bb82cff5 100644 --- a/src/observer/common/init.h +++ b/src/observer/common/init.h @@ -21,4 +21,4 @@ namespace oceanbase { int init(common::ProcessParam *processParam); void cleanup(); -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/common/type/attr_type.cpp b/src/observer/common/type/attr_type.cpp index 7c526d063..75aa910eb 100644 --- a/src/observer/common/type/attr_type.cpp +++ b/src/observer/common/type/attr_type.cpp @@ -8,7 +8,6 @@ EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. See the Mulan PSL v2 for more details. */ - #include "common/lang/string.h" #include "common/type/attr_type.h" @@ -34,13 +33,7 @@ AttrType attr_type_from_string(const char *s) return AttrType::UNDEFINED; } -bool is_numerical_type(AttrType type) -{ - return (type == AttrType::INTS || type == AttrType::FLOATS); -} +bool is_numerical_type(AttrType type) { return (type == AttrType::INTS || type == AttrType::FLOATS); } -bool is_string_type(AttrType type) -{ - return (type == AttrType::CHARS); -} -} \ No newline at end of file +bool is_string_type(AttrType type) { return (type == AttrType::CHARS); } +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/common/type/attr_type.h b/src/observer/common/type/attr_type.h index dcf488b35..8a73a201a 100644 --- a/src/observer/common/type/attr_type.h +++ b/src/observer/common/type/attr_type.h @@ -31,4 +31,4 @@ const char *attr_type_to_string(AttrType type); AttrType attr_type_from_string(const char *s); bool is_numerical_type(AttrType type); bool is_string_type(AttrType type); -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/common/type/char_type.cpp b/src/observer/common/type/char_type.cpp index 57ec67d47..e98e77110 100644 --- a/src/observer/common/type/char_type.cpp +++ b/src/observer/common/type/char_type.cpp @@ -13,7 +13,6 @@ See the Mulan PSL v2 for more details. */ #include "common/type/char_type.h" #include "common/value.h" - namespace oceanbase { int CharType::compare(const Value &left, const Value &right) const @@ -52,4 +51,4 @@ RC CharType::to_string(const Value &val, string &result) const result = ss.str(); return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/common/type/char_type.h b/src/observer/common/type/char_type.h index ecdbb09da..9c6968f92 100644 --- a/src/observer/common/type/char_type.h +++ b/src/observer/common/type/char_type.h @@ -36,4 +36,4 @@ class CharType : public DataType RC to_string(const Value &val, string &result) const override; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/common/type/data_type.cpp b/src/observer/common/type/data_type.cpp index c0d945ed2..71fda2765 100644 --- a/src/observer/common/type/data_type.cpp +++ b/src/observer/common/type/data_type.cpp @@ -27,4 +27,4 @@ array, static_cast(AttrType::MAXTYPE)> DataType::type_ make_unique(), make_unique(AttrType::BOOLEANS), }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/common/type/data_type.h b/src/observer/common/type/data_type.h index 2f02d5e82..cc7caaeca 100644 --- a/src/observer/common/type/data_type.h +++ b/src/observer/common/type/data_type.h @@ -106,4 +106,4 @@ class DataType static array, static_cast(AttrType::MAXTYPE)> type_instances_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/common/type/float_type.cpp b/src/observer/common/type/float_type.cpp index ddbb81b9f..d35f116b0 100644 --- a/src/observer/common/type/float_type.cpp +++ b/src/observer/common/type/float_type.cpp @@ -17,7 +17,6 @@ See the Mulan PSL v2 for more details. */ #include "common/value.h" #include "storage/common/column.h" - namespace oceanbase { int FloatType::compare(const Value &left, const Value &right) const @@ -33,8 +32,7 @@ int FloatType::compare(const Column &left, const Column &right, int left_idx, in { ASSERT(left.attr_type() == AttrType::FLOATS, "left type is not float"); ASSERT(right.attr_type() == AttrType::FLOATS, "right type is not float"); - return common::compare_float((void *)&((float*)left.data())[left_idx], - (void *)&((float*)right.data())[right_idx]); + return common::compare_float((void *)&((float *)left.data())[left_idx], (void *)&((float *)right.data())[right_idx]); } RC FloatType::add(const Value &left, const Value &right, Value &result) const @@ -73,7 +71,7 @@ RC FloatType::negative(const Value &val, Value &result) const RC FloatType::set_value_from_str(Value &val, const string &data) const { - RC rc = RC::SUCCESS; + RC rc = RC::SUCCESS; stringstream deserialize_stream; deserialize_stream.clear(); deserialize_stream.str(data); @@ -95,4 +93,4 @@ RC FloatType::to_string(const Value &val, string &result) const result = ss.str(); return RC::SUCCESS; } -} +} // namespace oceanbase diff --git a/src/observer/common/type/float_type.h b/src/observer/common/type/float_type.h index e3ddbf7a9..2c63133e3 100644 --- a/src/observer/common/type/float_type.h +++ b/src/observer/common/type/float_type.h @@ -37,4 +37,4 @@ class FloatType : public DataType RC to_string(const Value &val, string &result) const override; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/common/type/integer_type.cpp b/src/observer/common/type/integer_type.cpp index a01fdff6b..9fa6cf0f4 100644 --- a/src/observer/common/type/integer_type.cpp +++ b/src/observer/common/type/integer_type.cpp @@ -15,7 +15,6 @@ See the Mulan PSL v2 for more details. */ #include "common/value.h" #include "storage/common/column.h" - namespace oceanbase { int IntegerType::compare(const Value &left, const Value &right) const @@ -36,21 +35,18 @@ int IntegerType::compare(const Column &left, const Column &right, int left_idx, { ASSERT(left.attr_type() == AttrType::INTS, "left type is not integer"); ASSERT(right.attr_type() == AttrType::INTS, "right type is not integer"); - return common::compare_int((void *)&((int*)left.data())[left_idx], - (void *)&((int*)right.data())[right_idx]); + return common::compare_int((void *)&((int *)left.data())[left_idx], (void *)&((int *)right.data())[right_idx]); } RC IntegerType::cast_to(const Value &val, AttrType type, Value &result) const { switch (type) { - case AttrType::FLOATS: { - float float_value = val.get_int(); - result.set_float(float_value); - return RC::SUCCESS; - } - default: - LOG_WARN("unsupported type %d", type); - return RC::SCHEMA_FIELD_TYPE_MISMATCH; + case AttrType::FLOATS: { + float float_value = val.get_int(); + result.set_float(float_value); + return RC::SUCCESS; + } + default: LOG_WARN("unsupported type %d", type); return RC::SCHEMA_FIELD_TYPE_MISMATCH; } } @@ -80,7 +76,7 @@ RC IntegerType::negative(const Value &val, Value &result) const RC IntegerType::set_value_from_str(Value &val, const string &data) const { - RC rc = RC::SUCCESS; + RC rc = RC::SUCCESS; stringstream deserialize_stream; deserialize_stream.clear(); // 清理stream的状态，防止多次解析出现异常 deserialize_stream.str(data); @@ -101,4 +97,4 @@ RC IntegerType::to_string(const Value &val, string &result) const result = ss.str(); return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/common/type/integer_type.h b/src/observer/common/type/integer_type.h index 8f1755368..6a7528f60 100644 --- a/src/observer/common/type/integer_type.h +++ b/src/observer/common/type/integer_type.h @@ -48,4 +48,4 @@ class IntegerType : public DataType RC to_string(const Value &val, string &result) const override; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/common/type/string_t.h b/src/observer/common/type/string_t.h index 99518af8d..3d5f3004c 100644 --- a/src/observer/common/type/string_t.h +++ b/src/observer/common/type/string_t.h @@ -105,4 +105,4 @@ struct string_t Inlined inlined; } value; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/common/type/vector_type.h b/src/observer/common/type/vector_type.h index b9b06c526..ac1304d29 100644 --- a/src/observer/common/type/vector_type.h +++ b/src/observer/common/type/vector_type.h @@ -32,4 +32,4 @@ class VectorType : public DataType RC to_string(const Value &val, string &result) const override { return RC::UNIMPLEMENTED; } }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/common/types.h b/src/observer/common/types.h index 5ea1a3d65..d9fd945e9 100644 --- a/src/observer/common/types.h +++ b/src/observer/common/types.h @@ -77,4 +77,4 @@ enum class ExecutionMode /// page的CRC校验和 using CheckSum = unsigned int; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/common/value.cpp b/src/observer/common/value.cpp index 4406cc50e..dd2621e23 100644 --- a/src/observer/common/value.cpp +++ b/src/observer/common/value.cpp @@ -30,8 +30,7 @@ Value::Value(bool val) { set_boolean(val); } Value::Value(const char *s, int len /*= 0*/) { set_string(s, len); } -Value::Value(const string_t& s) { set_string(s.data(), s.size()); } - +Value::Value(const string_t &s) { set_string(s.data(), s.size()); } Value::Value(const Value &other) { @@ -185,12 +184,11 @@ void Value::set_empty_string(int len) reset(); attr_type_ = AttrType::CHARS; - own_data_ = true; + own_data_ = true; value_.pointer_value_ = new char[len + 1]; length_ = len; memset(value_.pointer_value_, 0, len); value_.pointer_value_[len] = '\0'; - } void Value::set_value(const Value &value) @@ -247,7 +245,10 @@ string Value::to_string() const return res; } -int Value::compare(const Value &other) const { return DataType::type_instance(this->attr_type_)->compare(*this, other); } +int Value::compare(const Value &other) const +{ + return DataType::type_instance(this->attr_type_)->compare(*this, other); +} int Value::get_int() const { @@ -351,4 +352,4 @@ bool Value::get_boolean() const } return false; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/common/value.h b/src/observer/common/value.h index e6f30e090..9aeb45a0f 100644 --- a/src/observer/common/value.h +++ b/src/observer/common/value.h @@ -20,7 +20,6 @@ See the Mulan PSL v2 for more details. */ #include "common/type/data_type.h" #include "common/type/string_t.h" - namespace oceanbase { /** @@ -138,4 +137,4 @@ class Value final /// 是否申请并占有内存, 目前对于 CHARS 类型 own_data_ 为true, 其余类型 own_data_ 为false bool own_data_ = false; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/event/session_event.cpp b/src/observer/event/session_event.cpp index 4fda87bbc..7874070b9 100644 --- a/src/observer/event/session_event.cpp +++ b/src/observer/event/session_event.cpp @@ -24,4 +24,4 @@ SessionEvent::~SessionEvent() {} Communicator *SessionEvent::get_communicator() const { return communicator_; } Session *SessionEvent::session() const { return communicator_->session(); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/event/session_event.h b/src/observer/event/session_event.h index efe27f10c..e76744406 100644 --- a/src/observer/event/session_event.h +++ b/src/observer/event/session_event.h @@ -48,4 +48,4 @@ class SessionEvent SqlDebug sql_debug_; ///< SQL调试信息 string query_; ///< SQL语句 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/event/sql_debug.cpp b/src/observer/event/sql_debug.cpp index 2ec9dfcab..910499bdc 100644 --- a/src/observer/event/sql_debug.cpp +++ b/src/observer/event/sql_debug.cpp @@ -18,7 +18,6 @@ See the Mulan PSL v2 for more details. */ #include "event/sql_debug.h" #include "session/session.h" - namespace oceanbase { void SqlDebug::add_debug_info(const string &debug_info) { debug_infos_.push_back(debug_info); } @@ -54,4 +53,4 @@ void sql_debug(const char *fmt, ...) delete[] str; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/event/sql_debug.h b/src/observer/event/sql_debug.h index bbd5d5083..fc09487bb 100644 --- a/src/observer/event/sql_debug.h +++ b/src/observer/event/sql_debug.h @@ -48,4 +48,4 @@ class SqlDebug * 在普通文本场景下，调试信息会直接输出到客户端，并增加 '#' 作为前缀。 */ void sql_debug(const char *fmt, ...); -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/event/sql_event.cpp b/src/observer/event/sql_event.cpp index 2506a57d9..6a310c03f 100644 --- a/src/observer/event/sql_event.cpp +++ b/src/observer/event/sql_event.cpp @@ -32,4 +32,4 @@ SQLStageEvent::~SQLStageEvent() noexcept stmt_ = nullptr; } } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/event/sql_event.h b/src/observer/event/sql_event.h index 0c34ac5b2..99c85dc57 100644 --- a/src/observer/event/sql_event.h +++ b/src/observer/event/sql_event.h @@ -53,4 +53,4 @@ class SQLStageEvent Stmt *stmt_ = nullptr; ///< Resolver之后生成的数据结构 unique_ptr operator_; ///< 生成的执行计划，也可能没有 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/event/storage_event.h b/src/observer/event/storage_event.h index c7cc31473..1570dac22 100644 --- a/src/observer/event/storage_event.h +++ b/src/observer/event/storage_event.h @@ -32,4 +32,4 @@ class StorageEvent : public common::StageEvent private: SQLStageEvent *sql_event_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/main.cpp b/src/observer/main.cpp index c83532d4c..f699b737e 100644 --- a/src/observer/main.cpp +++ b/src/observer/main.cpp @@ -37,7 +37,6 @@ namespace oceanbase { static Server *g_server = nullptr; - void usage() { cout << "Usage " << endl; @@ -211,4 +210,4 @@ int main(int argc, char **argv) return 0; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/buffered_writer.cpp b/src/observer/net/buffered_writer.cpp index e7e76e300..e2678cbd0 100644 --- a/src/observer/net/buffered_writer.cpp +++ b/src/observer/net/buffered_writer.cpp @@ -131,4 +131,4 @@ RC BufferedWriter::flush_internal(int32_t size) return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/buffered_writer.h b/src/observer/net/buffered_writer.h index 34cbc6ece..04c5a8c3e 100644 --- a/src/observer/net/buffered_writer.h +++ b/src/observer/net/buffered_writer.h @@ -72,4 +72,4 @@ class BufferedWriter int fd_ = -1; RingBuffer buffer_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/cli_communicator.cpp b/src/observer/net/cli_communicator.cpp index 52660cc88..001bf85c2 100644 --- a/src/observer/net/cli_communicator.cpp +++ b/src/observer/net/cli_communicator.cpp @@ -87,4 +87,4 @@ RC CliCommunicator::write_result(SessionEvent *event, bool &need_disconnect) } CliCommunicator::~CliCommunicator() { LOG_INFO("Command history saved to %s", LINE_HISTORY_FILE.c_str()); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/cli_communicator.h b/src/observer/net/cli_communicator.h index 750962250..1aa518d47 100644 --- a/src/observer/net/cli_communicator.h +++ b/src/observer/net/cli_communicator.h @@ -41,4 +41,4 @@ class CliCommunicator : public PlainCommunicator int write_fd_ = -1; ///< 与使用远程通讯模式不同，如果读数据使用标准输入，那么输出应该是标准输出 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/communicator.cpp b/src/observer/net/communicator.cpp index 346ec7460d..1c9ce1545 100644 --- a/src/observer/net/communicator.cpp +++ b/src/observer/net/communicator.cpp @@ -64,4 +64,4 @@ Communicator *CommunicatorFactory::create(CommunicateProtocol protocol) } } } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/communicator.h b/src/observer/net/communicator.h index 8399fd0c3..ad631cfb8 100644 --- a/src/observer/net/communicator.h +++ b/src/observer/net/communicator.h @@ -108,4 +108,4 @@ class CommunicatorFactory public: Communicator *create(CommunicateProtocol protocol); }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/java_thread_pool_thread_handler.cpp b/src/observer/net/java_thread_pool_thread_handler.cpp index 00ccfe3fe..9d801233e 100644 --- a/src/observer/net/java_thread_pool_thread_handler.cpp +++ b/src/observer/net/java_thread_pool_thread_handler.cpp @@ -27,13 +27,13 @@ using namespace common; /** * @brief libevent 消息回调函数的参数 - * + * */ struct EventCallbackAg { - JavaThreadPoolThreadHandler *host = nullptr; - Communicator *communicator = nullptr; - struct event *ev = nullptr; + JavaThreadPoolThreadHandler *host = nullptr; + Communicator *communicator = nullptr; + struct event *ev = nullptr; }; JavaThreadPoolThreadHandler::~JavaThreadPoolThreadHandler() @@ -61,10 +61,10 @@ RC JavaThreadPoolThreadHandler::start() // 创建线程池 // 这里写死了线程池的大小，实际上可以从配置文件中读取 int ret = executor_.init("SQL", // name - 2, // core size - 8, // max size - 60*1000 // keep alive time - ); + 2, // core size + 8, // max size + 60 * 1000 // keep alive time + ); if (0 != ret) { LOG_ERROR("failed to init thread pool executor"); return RC::INTERNAL; @@ -73,7 +73,7 @@ RC JavaThreadPoolThreadHandler::start() // libevent 的监测消息循环主体，要放在一个线程中执行 // event_loop_thread 是运行libevent 消息监测循环的函数，会长期运行，并且会放到线程池中占据一个线程 auto event_worker = std::bind(&JavaThreadPoolThreadHandler::event_loop_thread, this); - ret = executor_.execute(event_worker); + ret = executor_.execute(event_worker); if (0 != ret) { LOG_ERROR("failed to execute event worker"); return RC::INTERNAL; @@ -96,7 +96,7 @@ static void event_callback(evutil_socket_t fd, short event, void *arg) { if (event & (EV_READ | EV_CLOSED)) { LOG_TRACE("got event. fd=%d, event=%d", fd, event); - EventCallbackAg *ag = (EventCallbackAg *)arg; + EventCallbackAg *ag = (EventCallbackAg *)arg; JavaThreadPoolThreadHandler *handler = ag->host; handler->handle_event(ag); } else { @@ -115,7 +115,7 @@ void JavaThreadPoolThreadHandler::handle_event(EventCallbackAg *ag) // sql_handler 是一个回调函数 auto sql_handler = [this, ag]() { - RC rc = sql_task_handler_.handle_event(ag->communicator); // 这里会有接收消息、处理请求然后返回结果一条龙服务 + RC rc = sql_task_handler_.handle_event(ag->communicator); // 这里会有接收消息、处理请求然后返回结果一条龙服务 if (RC::SUCCESS != rc) { LOG_WARN("failed to handle sql task. rc=%s", strrc(rc)); this->close_connection(ag->communicator); @@ -130,7 +130,7 @@ void JavaThreadPoolThreadHandler::handle_event(EventCallbackAg *ag) // LOG_TRACE("add event. fd=%d, communicator=%p", event_get_fd(ag->ev), this); } }; - + executor_.execute(sql_handler); } @@ -150,9 +150,9 @@ RC JavaThreadPoolThreadHandler::new_connection(Communicator *communicator) int fd = communicator->fd(); LOG_INFO("new connection. fd=%d", fd); EventCallbackAg *ag = new EventCallbackAg; - ag->host = this; - ag->communicator = communicator; - ag->ev = nullptr; + ag->host = this; + ag->communicator = communicator; + ag->ev = nullptr; /// 创建一个libevent事件对象。其中EV_READ表示可读事件，就是客户端发消息时会触发事件。 /// EV_ET 表示边缘触发，有消息时只会触发一次，不会重复触发。这个标识在Linux平台上是支持的，但是有些平台不支持。 /// 使用EV_ET边缘触发时需要注意一个问题，就是每次一定要把客户端发来的消息都读取完，直到read返回EAGAIN为止。 @@ -187,7 +187,7 @@ RC JavaThreadPoolThreadHandler::close_connection(Communicator *communicator) { lock_guard guard(lock_); - auto iter = event_map_.find(communicator); + auto iter = event_map_.find(communicator); if (iter == event_map_.end()) { LOG_ERROR("cannot find event for communicator %p", communicator); return RC::INTERNAL; @@ -198,8 +198,8 @@ RC JavaThreadPoolThreadHandler::close_connection(Communicator *communicator) } if (ag->ev) { - event_del(ag->ev); // 把当前事件从event_base中删除 - event_free(ag->ev); // 释放event对象 + event_del(ag->ev); // 把当前事件从event_base中删除 + event_free(ag->ev); // 释放event对象 ag->ev = nullptr; } delete ag; @@ -247,4 +247,4 @@ RC JavaThreadPoolThreadHandler::await_stop() LOG_INFO("end to await event base stopped"); return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/java_thread_pool_thread_handler.h b/src/observer/net/java_thread_pool_thread_handler.h index 039b00d2f..ebff4c0ce 100644 --- a/src/observer/net/java_thread_pool_thread_handler.h +++ b/src/observer/net/java_thread_pool_thread_handler.h @@ -70,4 +70,4 @@ class JavaThreadPoolThreadHandler : public ThreadHandler SqlTaskHandler sql_task_handler_; /// SQL请求处理器 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/mysql_communicator.cpp b/src/observer/net/mysql_communicator.cpp index f8a38de87..bad1d3c83 100644 --- a/src/observer/net/mysql_communicator.cpp +++ b/src/observer/net/mysql_communicator.cpp @@ -350,7 +350,7 @@ struct HandshakeV10 : public BasePacket char *buf = net_packet.data(); int pos = 0; - pos += 3; // skip packet length + pos += 3; // skip packet length pos += store_int1(buf + pos, packet_header.sequence_id); pos += store_int1(buf + pos, protocol); @@ -381,12 +381,12 @@ struct HandshakeV10 : public BasePacket */ struct OkPacket : public BasePacket { - int8_t header = 0; // 0x00 for ok and 0xFE for EOF - int32_t affected_rows = 0; - int32_t last_insert_id = 0; - int16_t status_flags = 0x22; - int16_t warnings = 0; - string info; // human readable status information + int8_t header = 0; // 0x00 for ok and 0xFE for EOF + int32_t affected_rows = 0; + int32_t last_insert_id = 0; + int16_t status_flags = 0x22; + int16_t warnings = 0; + string info; // human readable status information OkPacket(int8_t sequence = 0) : BasePacket(sequence) {} virtual ~OkPacket() = default; @@ -400,7 +400,7 @@ struct OkPacket : public BasePacket char *buf = net_packet.data(); int pos = 0; - pos += 3; // skip packet length + pos += 3; // skip packet length pos += store_int1(buf + pos, packet_header.sequence_id); pos += store_int1(buf + pos, header); pos += store_lenenc_int(buf + pos, affected_rows); @@ -473,11 +473,11 @@ struct EofPacket : public BasePacket */ struct ErrPacket : public BasePacket { - int8_t header = 0xFF; - int16_t error_code = 0; - char sql_state_marker[1] = {'#'}; - string sql_state{"HY000"}; - string error_message; + int8_t header = 0xFF; + int16_t error_code = 0; + char sql_state_marker[1] = {'#'}; + string sql_state{"HY000"}; + string error_message; ErrPacket(int8_t sequence = 0) : BasePacket(sequence) {} virtual ~ErrPacket() = default; @@ -521,7 +521,7 @@ struct QueryPacket { PacketHeader packet_header; int8_t command; // 0x03: COM_QUERY - string query; // the text of the SQL query to execute + string query; // the text of the SQL query to execute }; /** @@ -697,8 +697,8 @@ RC MysqlCommunicator::write_state(SessionEvent *event, bool &need_disconnect) { SqlResult *sql_result = event->sql_result(); - const int buf_size = 2048; - char *buf = new char[buf_size]; + const int buf_size = 2048; + char *buf = new char[buf_size]; const string &state_string = sql_result->state_string(); if (state_string.empty()) { const char *result = strrc(sql_result->return_code()); @@ -939,16 +939,16 @@ RC MysqlCommunicator::send_column_definition(SqlResult *sql_result, bool &need_d * @param no_column_def 为了特殊处理没有返回值的语句，比如insert/delete，需要做特殊处理。 * 这种语句只需要返回一个ok packet即可 */ -RC MysqlCommunicator::send_result_rows(SessionEvent *event, SqlResult *sql_result, bool no_column_def, bool &need_disconnect) +RC MysqlCommunicator::send_result_rows( + SessionEvent *event, SqlResult *sql_result, bool no_column_def, bool &need_disconnect) { RC rc = RC::SUCCESS; vector packet; packet.resize(4 * 1024 * 1024); // TODO warning: length cannot be fix - int affected_rows = 0; - if (event->session()->get_execution_mode() == ExecutionMode::CHUNK_ITERATOR - && event->session()->used_chunk_mode()) { + int affected_rows = 0; + if (event->session()->get_execution_mode() == ExecutionMode::CHUNK_ITERATOR && event->session()->used_chunk_mode()) { rc = write_chunk_result(sql_result, packet, affected_rows, need_disconnect); } else { rc = write_tuple_result(sql_result, packet, affected_rows, need_disconnect); @@ -973,10 +973,11 @@ RC MysqlCommunicator::send_result_rows(SessionEvent *event, SqlResult *sql_resul return rc; } -RC MysqlCommunicator::write_tuple_result(SqlResult *sql_result, vector &packet, int &affected_rows, bool &need_disconnect) +RC MysqlCommunicator::write_tuple_result( + SqlResult *sql_result, vector &packet, int &affected_rows, bool &need_disconnect) { - Tuple *tuple = nullptr; - RC rc = RC::SUCCESS; + Tuple *tuple = nullptr; + RC rc = RC::SUCCESS; while (RC::SUCCESS == (rc = sql_result->next_tuple(tuple))) { assert(tuple != nullptr); @@ -1018,10 +1019,11 @@ RC MysqlCommunicator::write_tuple_result(SqlResult *sql_result, vector &pa } return rc; } -RC MysqlCommunicator::write_chunk_result(SqlResult *sql_result, vector &packet, int &affected_rows, bool &need_disconnect) +RC MysqlCommunicator::write_chunk_result( + SqlResult *sql_result, vector &packet, int &affected_rows, bool &need_disconnect) { Chunk chunk; - RC rc = RC::SUCCESS; + RC rc = RC::SUCCESS; while (RC::SUCCESS == (rc = sql_result->next_chunk(chunk))) { int column_num = chunk.column_num(); if (column_num == 0) { @@ -1055,4 +1057,4 @@ RC MysqlCommunicator::write_chunk_result(SqlResult *sql_result, vector &pa } return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/mysql_communicator.h b/src/observer/net/mysql_communicator.h index 605669014..3c27a4668 100644 --- a/src/observer/net/mysql_communicator.h +++ b/src/observer/net/mysql_communicator.h @@ -107,4 +107,4 @@ class MysqlCommunicator : public Communicator //! 这个sequence id是递增的 int8_t sequence_id_ = 0; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/one_thread_per_connection_thread_handler.cpp b/src/observer/net/one_thread_per_connection_thread_handler.cpp index d3681b36f..75801248c 100644 --- a/src/observer/net/one_thread_per_connection_thread_handler.cpp +++ b/src/observer/net/one_thread_per_connection_thread_handler.cpp @@ -30,9 +30,7 @@ namespace oceanbase { class Worker { public: - Worker(ThreadHandler &host, Communicator *communicator) - : host_(host), communicator_(communicator) - {} + Worker(ThreadHandler &host, Communicator *communicator) : host_(host), communicator_(communicator) {} ~Worker() { if (thread_ != nullptr) { @@ -57,7 +55,7 @@ class Worker { if (thread_) { if (thread_->get_id() == this_thread::get_id()) { - thread_->detach(); // 如果当前线程join当前线程，就会卡死 + thread_->detach(); // 如果当前线程join当前线程，就会卡死 } else { thread_->join(); } @@ -76,8 +74,8 @@ class Worker } struct pollfd poll_fd; - poll_fd.fd = communicator_->fd(); - poll_fd.events = POLLIN; + poll_fd.fd = communicator_->fd(); + poll_fd.events = POLLIN; poll_fd.revents = 0; while (running_) { @@ -103,15 +101,15 @@ class Worker } LOG_INFO("worker thread stop. communicator = %p", communicator_); - host_.close_connection(communicator_); /// 连接关闭后，当前对象会被删除 + host_.close_connection(communicator_); /// 连接关闭后，当前对象会被删除 } private: ThreadHandler &host_; SqlTaskHandler task_handler_; - Communicator *communicator_ = nullptr; - thread *thread_ = nullptr; - volatile bool running_ = true; + Communicator *communicator_ = nullptr; + thread *thread_ = nullptr; + volatile bool running_ = true; }; OneThreadPerConnectionThreadHandler::~OneThreadPerConnectionThreadHandler() @@ -130,7 +128,7 @@ RC OneThreadPerConnectionThreadHandler::new_connection(Communicator *communicato return RC::FILE_EXIST; } - Worker *worker = new Worker(*this, communicator); + Worker *worker = new Worker(*this, communicator); thread_map_[communicator] = worker; return worker->start(); } @@ -176,4 +174,4 @@ RC OneThreadPerConnectionThreadHandler::await_stop() LOG_INFO("end to await stop one thread per connection thread handler"); return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/one_thread_per_connection_thread_handler.h b/src/observer/net/one_thread_per_connection_thread_handler.h index 513697a2e..44f4b8c64 100644 --- a/src/observer/net/one_thread_per_connection_thread_handler.h +++ b/src/observer/net/one_thread_per_connection_thread_handler.h @@ -49,4 +49,4 @@ class OneThreadPerConnectionThreadHandler : public ThreadHandler /// 保护线程安全的锁 mutex lock_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/plain_communicator.cpp b/src/observer/net/plain_communicator.cpp index 01d7a830e..462006139 100644 --- a/src/observer/net/plain_communicator.cpp +++ b/src/observer/net/plain_communicator.cpp @@ -239,8 +239,7 @@ RC PlainCommunicator::write_result_internal(SessionEvent *event, bool &need_disc } rc = RC::SUCCESS; - if (event->session()->get_execution_mode() == ExecutionMode::CHUNK_ITERATOR - && event->session()->used_chunk_mode()) { + if (event->session()->get_execution_mode() == ExecutionMode::CHUNK_ITERATOR && event->session()->used_chunk_mode()) { rc = write_chunk_result(sql_result); } else { rc = write_tuple_result(sql_result); @@ -274,7 +273,7 @@ RC PlainCommunicator::write_result_internal(SessionEvent *event, bool &need_disc RC PlainCommunicator::write_tuple_result(SqlResult *sql_result) { - RC rc = RC::SUCCESS; + RC rc = RC::SUCCESS; Tuple *tuple = nullptr; while (RC::SUCCESS == (rc = sql_result->next_tuple(tuple))) { assert(tuple != nullptr); @@ -328,7 +327,7 @@ RC PlainCommunicator::write_tuple_result(SqlResult *sql_result) RC PlainCommunicator::write_chunk_result(SqlResult *sql_result) { - RC rc = RC::SUCCESS; + RC rc = RC::SUCCESS; Chunk chunk; while (RC::SUCCESS == (rc = sql_result->next_chunk(chunk))) { int col_num = chunk.column_num(); @@ -373,4 +372,4 @@ RC PlainCommunicator::write_chunk_result(SqlResult *sql_result) } return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/plain_communicator.h b/src/observer/net/plain_communicator.h index 3702981b9..ed6f5e606 100644 --- a/src/observer/net/plain_communicator.h +++ b/src/observer/net/plain_communicator.h @@ -46,4 +46,4 @@ class PlainCommunicator : public Communicator vector send_message_delimiter_; ///< 发送消息分隔符 vector debug_message_prefix_; ///< 调试信息前缀 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/ring_buffer.cpp b/src/observer/net/ring_buffer.cpp index a1b4fcda8..a5b35c218 100644 --- a/src/observer/net/ring_buffer.cpp +++ b/src/observer/net/ring_buffer.cpp @@ -34,7 +34,7 @@ RC RingBuffer::read(char *buf, int32_t size, int32_t &read_size) RC rc = RC::SUCCESS; read_size = 0; - while (OB_SUCC(rc) && read_sizesize()> 0) { + while (OB_SUCC(rc) && read_size < size && this->size() > 0) { const char *tmp_buf = nullptr; int32_t tmp_size = 0; rc = buffer(tmp_buf, tmp_size); @@ -92,7 +92,7 @@ RC RingBuffer::write(const char *data, int32_t size, int32_t &write_size) RC rc = RC::SUCCESS; write_size = 0; - while (OB_SUCC(rc) && write_sizeremain()> 0) { + while (OB_SUCC(rc) && write_size < size && this->remain() > 0) { const int32_t read_pos = this->read_pos(); const int32_t tmp_buf_size = (read_pos <= write_pos_) ? (capacity() - write_pos_) : (read_pos - write_pos_); @@ -106,4 +106,4 @@ RC RingBuffer::write(const char *data, int32_t size, int32_t &write_size) return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/ring_buffer.h b/src/observer/net/ring_buffer.h index 36cdd03a5..96b1a0304 100644 --- a/src/observer/net/ring_buffer.h +++ b/src/observer/net/ring_buffer.h @@ -95,4 +95,4 @@ class RingBuffer int32_t data_size_ = 0; ///< 已经写入的数据量 int32_t write_pos_ = 0; ///< 当前写指针的位置，范围不会超出[0, capacity) }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/server.cpp b/src/observer/net/server.cpp index da2955c06..32980b323 100644 --- a/src/observer/net/server.cpp +++ b/src/observer/net/server.cpp @@ -346,4 +346,4 @@ void CliServer::shutdown() // cleanup started_ = false; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/server.h b/src/observer/net/server.h index 6de7b2c1d..f14e5dc47 100644 --- a/src/observer/net/server.h +++ b/src/observer/net/server.h @@ -100,4 +100,4 @@ class CliServer : public Server private: volatile bool started_ = false; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/server_param.h b/src/observer/net/server_param.h index 8a29534fc..b5aa503b7 100644 --- a/src/observer/net/server_param.h +++ b/src/observer/net/server_param.h @@ -51,4 +51,4 @@ class ServerParam string thread_handling; ///< 线程池模型 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/sql_task_handler.cpp b/src/observer/net/sql_task_handler.cpp index d7e3e9e28..66ca60dfa 100644 --- a/src/observer/net/sql_task_handler.cpp +++ b/src/observer/net/sql_task_handler.cpp @@ -23,7 +23,7 @@ namespace oceanbase { RC SqlTaskHandler::handle_event(Communicator *communicator) { SessionEvent *event = nullptr; - RC rc = communicator->read_event(event); + RC rc = communicator->read_event(event); if (OB_FAIL(rc)) { return rc; } @@ -91,4 +91,4 @@ RC SqlTaskHandler::handle_sql(SQLStageEvent *sql_event) return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/sql_task_handler.h b/src/observer/net/sql_task_handler.h index 7b32eb250..d2d601be1 100644 --- a/src/observer/net/sql_task_handler.h +++ b/src/observer/net/sql_task_handler.h @@ -52,7 +52,7 @@ class SqlTaskHandler QueryCacheStage query_cache_stage_; /// 查询缓存阶段 ParseStage parse_stage_; /// 解析阶段。将SQL解析成语法树 ParsedSqlNode ResolveStage resolve_stage_; /// 解析阶段。将语法树解析成Stmt(statement) - OptimizeStage optimize_stage_; /// 优化阶段。将语句优化成执行计划，包含规则优化和物理优化 - ExecuteStage execute_stage_; /// 执行阶段 + OptimizeStage optimize_stage_; /// 优化阶段。将语句优化成执行计划，包含规则优化和物理优化 + ExecuteStage execute_stage_; /// 执行阶段 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/thread_handler.cpp b/src/observer/net/thread_handler.cpp index 3db34b20e..7e4c31b11 100644 --- a/src/observer/net/thread_handler.cpp +++ b/src/observer/net/thread_handler.cpp @@ -22,7 +22,7 @@ See the Mulan PSL v2 for more details. */ namespace oceanbase { -ThreadHandler * ThreadHandler::create(const char *name) +ThreadHandler *ThreadHandler::create(const char *name) { const char *default_name = "one-thread-per-connection"; if (nullptr == name || common::is_blank(name)) { @@ -38,4 +38,4 @@ ThreadHandler * ThreadHandler::create(const char *name) return nullptr; } } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/net/thread_handler.h b/src/observer/net/thread_handler.h index 924555f1a..5d6ac2ab6 100644 --- a/src/observer/net/thread_handler.h +++ b/src/observer/net/thread_handler.h @@ -65,4 +65,4 @@ class ThreadHandler */ static ThreadHandler *create(const char *name); }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/session/session.cpp b/src/observer/session/session.cpp index 68c9367b4..c11e4e384 100644 --- a/src/observer/session/session.cpp +++ b/src/observer/session/session.cpp @@ -79,12 +79,12 @@ Trx *Session::current_trx() } void Session::destroy_trx() - { - if (trx_ != nullptr) { - db_->trx_kit().destroy_trx(trx_); - trx_ = nullptr; - } +{ + if (trx_ != nullptr) { + db_->trx_kit().destroy_trx(trx_); + trx_ = nullptr; } +} thread_local Session *thread_session = nullptr; @@ -95,4 +95,4 @@ Session *Session::current_session() { return thread_session; } void Session::set_current_request(SessionEvent *request) { current_request_ = request; } SessionEvent *Session::current_request() const { return current_request_; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/session/session.h b/src/observer/session/session.h index ff0e4aa8e..61dabc147 100644 --- a/src/observer/session/session.h +++ b/src/observer/session/session.h @@ -126,4 +126,4 @@ class Session ExecutionMode execution_mode_ = ExecutionMode::TUPLE_ITERATOR; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/session/session_stage.cpp b/src/observer/session/session_stage.cpp index fcef75450..44955f321 100644 --- a/src/observer/session/session_stage.cpp +++ b/src/observer/session/session_stage.cpp @@ -113,4 +113,4 @@ RC SessionStage::handle_sql(SQLStageEvent *sql_event) return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/session/session_stage.h b/src/observer/session/session_stage.h index c367d661b..86322b5d3 100644 --- a/src/observer/session/session_stage.h +++ b/src/observer/session/session_stage.h @@ -58,4 +58,4 @@ class SessionStage OptimizeStage optimize_stage_; ExecuteStage execute_stage_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/session/thread_data.cpp b/src/observer/session/thread_data.cpp index 774724b4c..782f45b73 100644 --- a/src/observer/session/thread_data.cpp +++ b/src/observer/session/thread_data.cpp @@ -20,4 +20,4 @@ namespace oceanbase { thread_local ThreadData *ThreadData::thread_data_; Trx *ThreadData::trx() const { return (session_ == nullptr) ? nullptr : session_->current_trx(); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/session/thread_data.h b/src/observer/session/thread_data.h index 869b156c6..8ee9d1669 100644 --- a/src/observer/session/thread_data.h +++ b/src/observer/session/thread_data.h @@ -40,4 +40,4 @@ class ThreadData private: Session *session_ = nullptr; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/analyze_table_executor.cpp b/src/observer/sql/executor/analyze_table_executor.cpp index 7f93d7115..7542bd1ca 100644 --- a/src/observer/sql/executor/analyze_table_executor.cpp +++ b/src/observer/sql/executor/analyze_table_executor.cpp @@ -35,8 +35,8 @@ RC AnalyzeTableExecutor::execute(SQLStageEvent *sql_event) static_cast(stmt->type())); AnalyzeTableStmt *analyze_table_stmt = static_cast(stmt); - SqlResult *sql_result = session_event->sql_result(); - const char *table_name = analyze_table_stmt->table_name().c_str(); + SqlResult *sql_result = session_event->sql_result(); + const char *table_name = analyze_table_stmt->table_name().c_str(); Db *db = session->get_current_db(); Table *table = db->find_table(table_name); @@ -46,7 +46,7 @@ RC AnalyzeTableExecutor::execute(SQLStageEvent *sql_event) int table_id = table->table_id(); table->get_record_scanner(scanner_, session->current_trx(), ReadWriteMode::READ_ONLY); Record dummy; - int row_nums = 0; + int row_nums = 0; while (OB_SUCC(rc = scanner_->next(dummy))) { row_nums++; } @@ -55,7 +55,7 @@ RC AnalyzeTableExecutor::execute(SQLStageEvent *sql_event) } else { return rc; } - + TableStats stats(row_nums); Catalog::get_instance().update_table_stats(table_id, stats); } else { @@ -65,11 +65,11 @@ RC AnalyzeTableExecutor::execute(SQLStageEvent *sql_event) return rc; } -AnalyzeTableExecutor::~AnalyzeTableExecutor() +AnalyzeTableExecutor::~AnalyzeTableExecutor() { if (scanner_ != nullptr) { delete scanner_; scanner_ = nullptr; } } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/analyze_table_executor.h b/src/observer/sql/executor/analyze_table_executor.h index cfa344fd9..52919162a 100644 --- a/src/observer/sql/executor/analyze_table_executor.h +++ b/src/observer/sql/executor/analyze_table_executor.h @@ -32,4 +32,4 @@ class AnalyzeTableExecutor private: RecordScanner *scanner_ = nullptr; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/command_executor.cpp b/src/observer/sql/executor/command_executor.cpp index da72c0ffc..c56c6283c 100644 --- a/src/observer/sql/executor/command_executor.cpp +++ b/src/observer/sql/executor/command_executor.cpp @@ -104,4 +104,4 @@ RC CommandExecutor::execute(SQLStageEvent *sql_event) return rc; } -} +} // namespace oceanbase diff --git a/src/observer/sql/executor/command_executor.h b/src/observer/sql/executor/command_executor.h index e02a7cc98..b60b083c1 100644 --- a/src/observer/sql/executor/command_executor.h +++ b/src/observer/sql/executor/command_executor.h @@ -37,4 +37,4 @@ class CommandExecutor RC execute(SQLStageEvent *sql_event); }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/create_index_executor.cpp b/src/observer/sql/executor/create_index_executor.cpp index 0038853be..5ca70e475 100644 --- a/src/observer/sql/executor/create_index_executor.cpp +++ b/src/observer/sql/executor/create_index_executor.cpp @@ -36,4 +36,4 @@ RC CreateIndexExecutor::execute(SQLStageEvent *sql_event) Table *table = create_index_stmt->table(); return table->create_index(trx, create_index_stmt->field_meta(), create_index_stmt->index_name().c_str()); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/create_index_executor.h b/src/observer/sql/executor/create_index_executor.h index 35021db75..f101ff22a 100644 --- a/src/observer/sql/executor/create_index_executor.h +++ b/src/observer/sql/executor/create_index_executor.h @@ -33,4 +33,4 @@ class CreateIndexExecutor RC execute(SQLStageEvent *sql_event); }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/create_table_executor.cpp b/src/observer/sql/executor/create_table_executor.cpp index 9c8b091ce..dac941754 100644 --- a/src/observer/sql/executor/create_table_executor.cpp +++ b/src/observer/sql/executor/create_table_executor.cpp @@ -34,8 +34,11 @@ RC CreateTableExecutor::execute(SQLStageEvent *sql_event) CreateTableStmt *create_table_stmt = static_cast(stmt); const char *table_name = create_table_stmt->table_name().c_str(); - RC rc = session->get_current_db()->create_table(table_name, create_table_stmt->attr_infos(), create_table_stmt->primary_keys(), create_table_stmt->storage_format()); + RC rc = session->get_current_db()->create_table(table_name, + create_table_stmt->attr_infos(), + create_table_stmt->primary_keys(), + create_table_stmt->storage_format()); return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/create_table_executor.h b/src/observer/sql/executor/create_table_executor.h index b15991dd7..bc9dff4a3 100644 --- a/src/observer/sql/executor/create_table_executor.h +++ b/src/observer/sql/executor/create_table_executor.h @@ -32,4 +32,4 @@ class CreateTableExecutor RC execute(SQLStageEvent *sql_event); }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/desc_table_executor.cpp b/src/observer/sql/executor/desc_table_executor.cpp index c248ce8db..589b73d83 100644 --- a/src/observer/sql/executor/desc_table_executor.cpp +++ b/src/observer/sql/executor/desc_table_executor.cpp @@ -66,4 +66,4 @@ RC DescTableExecutor::execute(SQLStageEvent *sql_event) } return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/desc_table_executor.h b/src/observer/sql/executor/desc_table_executor.h index 428a34ebe..93905fc90 100644 --- a/src/observer/sql/executor/desc_table_executor.h +++ b/src/observer/sql/executor/desc_table_executor.h @@ -32,4 +32,4 @@ class DescTableExecutor RC execute(SQLStageEvent *sql_event); }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/execute_stage.cpp b/src/observer/sql/executor/execute_stage.cpp index 2e77d3bfb..66c6fd651 100644 --- a/src/observer/sql/executor/execute_stage.cpp +++ b/src/observer/sql/executor/execute_stage.cpp @@ -60,4 +60,4 @@ RC ExecuteStage::handle_request_with_physical_operator(SQLStageEvent *sql_event) sql_result->set_operator(std::move(physical_operator)); return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/execute_stage.h b/src/observer/sql/executor/execute_stage.h index ee67a49d6..f9c00b57c 100644 --- a/src/observer/sql/executor/execute_stage.h +++ b/src/observer/sql/executor/execute_stage.h @@ -34,4 +34,4 @@ class ExecuteStage RC handle_request(SQLStageEvent *event); RC handle_request_with_physical_operator(SQLStageEvent *sql_event); }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/help_executor.h b/src/observer/sql/executor/help_executor.h index f03e1cccf..4865b949a 100644 --- a/src/observer/sql/executor/help_executor.h +++ b/src/observer/sql/executor/help_executor.h @@ -59,4 +59,4 @@ class HelpExecutor return RC::SUCCESS; } }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/load_data_executor.cpp b/src/observer/sql/executor/load_data_executor.cpp index aaf976657..f6b7b9169 100644 --- a/src/observer/sql/executor/load_data_executor.cpp +++ b/src/observer/sql/executor/load_data_executor.cpp @@ -83,9 +83,9 @@ RC insert_record_from_file( return rc; } - // TODO: pax format and row format -void LoadDataExecutor::load_data(Table *table, const char *file_name, char terminated, char enclosed, SqlResult *sql_result) +void LoadDataExecutor::load_data( + Table *table, const char *file_name, char terminated, char enclosed, SqlResult *sql_result) { // your code here stringstream result_string; @@ -104,13 +104,13 @@ void LoadDataExecutor::load_data(Table *table, const char *file_name, char termi const int sys_field_num = table->table_meta().sys_field_num(); const int field_num = table->table_meta().field_num() - sys_field_num; - vector record_values(field_num); - string line; + vector record_values(field_num); + string line; vector file_values; - const string delim("|"); - int line_num = 0; - int insertion_count = 0; - RC rc = RC::SUCCESS; + const string delim("|"); + int line_num = 0; + int insertion_count = 0; + RC rc = RC::SUCCESS; while (!fs.eof() && RC::SUCCESS == rc) { getline(fs, line); line_num++; @@ -149,4 +149,4 @@ void LoadDataExecutor::load_data(Table *table, const char *file_name, char termi LOG_INFO("load data done. row num: %s, result: %s", insertion_count, strrc(rc)); sql_result->set_return_code(RC::SUCCESS); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/load_data_executor.h b/src/observer/sql/executor/load_data_executor.h index f71a73ec3..b6c721952 100644 --- a/src/observer/sql/executor/load_data_executor.h +++ b/src/observer/sql/executor/load_data_executor.h @@ -37,4 +37,4 @@ class LoadDataExecutor private: void load_data(Table *table, const char *file_name, char terminated, char enclosed, SqlResult *sql_result); }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/set_variable_executor.cpp b/src/observer/sql/executor/set_variable_executor.cpp index d63c9a004..8fadd35a8 100644 --- a/src/observer/sql/executor/set_variable_executor.cpp +++ b/src/observer/sql/executor/set_variable_executor.cpp @@ -14,104 +14,104 @@ namespace oceanbase { RC SetVariableExecutor::execute(SQLStageEvent *sql_event) { - RC rc = RC::SUCCESS; - - Session *session = sql_event->session_event()->session(); - SetVariableStmt *stmt = (SetVariableStmt *)sql_event->stmt(); - - const char *var_name = stmt->var_name(); - const Value &var_value = stmt->var_value(); - // TODO: refactor the variable configuration - if (strcasecmp(var_name, "sql_debug") == 0) { - bool bool_value = false; - rc = var_value_to_boolean(var_value, bool_value); - if (rc == RC::SUCCESS) { - session->set_sql_debug(bool_value); - LOG_TRACE("set sql_debug to %d", bool_value); - } - } else if (strcasecmp(var_name, "execution_mode") == 0) { - ExecutionMode execution_mode = ExecutionMode::UNKNOWN_MODE; - rc = get_execution_mode(var_value, execution_mode); - if (rc == RC::SUCCESS && execution_mode != ExecutionMode::UNKNOWN_MODE) { - session->set_execution_mode(execution_mode); - } else { - rc = RC::INVALID_ARGUMENT; - } - } else if (strcasecmp(var_name, "hash_join") == 0) { // TODO: remove this configuration - bool bool_value = false; - rc = var_value_to_boolean(var_value, bool_value); - if (rc == RC::SUCCESS) { - session->set_hash_join(bool_value); - LOG_TRACE("set hash_join to %d", bool_value); - } - } else if (strcasecmp(var_name, "use_cascade") == 0) { - // TODO: remove this params, due to the dblab needed, likely to be long-existing - bool bool_value = false; - rc = var_value_to_boolean(var_value, bool_value); - if (rc == RC::SUCCESS) { - session->set_use_cascade(bool_value); - LOG_TRACE("set use_cascade to %d", bool_value); - } - } else { - rc = RC::VARIABLE_NOT_EXISTS; + RC rc = RC::SUCCESS; + + Session *session = sql_event->session_event()->session(); + SetVariableStmt *stmt = (SetVariableStmt *)sql_event->stmt(); + + const char *var_name = stmt->var_name(); + const Value &var_value = stmt->var_value(); + // TODO: refactor the variable configuration + if (strcasecmp(var_name, "sql_debug") == 0) { + bool bool_value = false; + rc = var_value_to_boolean(var_value, bool_value); + if (rc == RC::SUCCESS) { + session->set_sql_debug(bool_value); + LOG_TRACE("set sql_debug to %d", bool_value); + } + } else if (strcasecmp(var_name, "execution_mode") == 0) { + ExecutionMode execution_mode = ExecutionMode::UNKNOWN_MODE; + rc = get_execution_mode(var_value, execution_mode); + if (rc == RC::SUCCESS && execution_mode != ExecutionMode::UNKNOWN_MODE) { + session->set_execution_mode(execution_mode); + } else { + rc = RC::INVALID_ARGUMENT; } + } else if (strcasecmp(var_name, "hash_join") == 0) { // TODO: remove this configuration + bool bool_value = false; + rc = var_value_to_boolean(var_value, bool_value); + if (rc == RC::SUCCESS) { + session->set_hash_join(bool_value); + LOG_TRACE("set hash_join to %d", bool_value); + } + } else if (strcasecmp(var_name, "use_cascade") == 0) { + // TODO: remove this params, due to the dblab needed, likely to be long-existing + bool bool_value = false; + rc = var_value_to_boolean(var_value, bool_value); + if (rc == RC::SUCCESS) { + session->set_use_cascade(bool_value); + LOG_TRACE("set use_cascade to %d", bool_value); + } + } else { + rc = RC::VARIABLE_NOT_EXISTS; + } - return rc; + return rc; } RC SetVariableExecutor::var_value_to_boolean(const Value &var_value, bool &bool_value) const { - RC rc = RC::SUCCESS; + RC rc = RC::SUCCESS; - if (var_value.attr_type() == AttrType::BOOLEANS) { - bool_value = var_value.get_boolean(); - } else if (var_value.attr_type() == AttrType::INTS) { - bool_value = var_value.get_int() != 0; - } else if (var_value.attr_type() == AttrType::FLOATS) { - bool_value = var_value.get_float() != 0.0; - } else if (var_value.attr_type() == AttrType::CHARS) { + if (var_value.attr_type() == AttrType::BOOLEANS) { + bool_value = var_value.get_boolean(); + } else if (var_value.attr_type() == AttrType::INTS) { + bool_value = var_value.get_int() != 0; + } else if (var_value.attr_type() == AttrType::FLOATS) { + bool_value = var_value.get_float() != 0.0; + } else if (var_value.attr_type() == AttrType::CHARS) { - string true_strings[] = {"true", "on", "yes", "t", "1"}; + string true_strings[] = {"true", "on", "yes", "t", "1"}; - string false_strings[] = {"false", "off", "no", "f", "0"}; + string false_strings[] = {"false", "off", "no", "f", "0"}; - for (size_t i = 0; i < sizeof(true_strings) / sizeof(true_strings[0]); i++) { - if (strcasecmp(var_value.get_string().c_str(), true_strings[i].c_str()) == 0) { - bool_value = true; - return rc; - } + for (size_t i = 0; i < sizeof(true_strings) / sizeof(true_strings[0]); i++) { + if (strcasecmp(var_value.get_string().c_str(), true_strings[i].c_str()) == 0) { + bool_value = true; + return rc; } + } - for (size_t i = 0; i < sizeof(false_strings) / sizeof(false_strings[0]); i++) { - if (strcasecmp(var_value.get_string().c_str(), false_strings[i].c_str()) == 0) { - bool_value = false; - return rc; - } + for (size_t i = 0; i < sizeof(false_strings) / sizeof(false_strings[0]); i++) { + if (strcasecmp(var_value.get_string().c_str(), false_strings[i].c_str()) == 0) { + bool_value = false; + return rc; } - rc = RC::VARIABLE_NOT_VALID; } + rc = RC::VARIABLE_NOT_VALID; + } - return rc; + return rc; } RC SetVariableExecutor::get_execution_mode(const Value &var_value, ExecutionMode &execution_mode) const { - RC rc = RC::SUCCESS; - - if (var_value.attr_type() == AttrType::CHARS) { - if (strcasecmp(var_value.get_string().c_str(), "TUPLE_ITERATOR") == 0) { - execution_mode = ExecutionMode::TUPLE_ITERATOR; - } else if (strcasecmp(var_value.get_string().c_str(), "CHUNK_ITERATOR") == 0) { - execution_mode = ExecutionMode::CHUNK_ITERATOR; - } else { - execution_mode = ExecutionMode::UNKNOWN_MODE; - rc = RC::VARIABLE_NOT_VALID; - } - } else { + RC rc = RC::SUCCESS; + + if (var_value.attr_type() == AttrType::CHARS) { + if (strcasecmp(var_value.get_string().c_str(), "TUPLE_ITERATOR") == 0) { + execution_mode = ExecutionMode::TUPLE_ITERATOR; + } else if (strcasecmp(var_value.get_string().c_str(), "CHUNK_ITERATOR") == 0) { + execution_mode = ExecutionMode::CHUNK_ITERATOR; + } else { execution_mode = ExecutionMode::UNKNOWN_MODE; - rc = RC::VARIABLE_NOT_VALID; + rc = RC::VARIABLE_NOT_VALID; } + } else { + execution_mode = ExecutionMode::UNKNOWN_MODE; + rc = RC::VARIABLE_NOT_VALID; + } - return rc; + return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/set_variable_executor.h b/src/observer/sql/executor/set_variable_executor.h index fcc61bcc1..91c28ec42 100644 --- a/src/observer/sql/executor/set_variable_executor.h +++ b/src/observer/sql/executor/set_variable_executor.h @@ -39,4 +39,4 @@ class SetVariableExecutor RC get_execution_mode(const Value &var_value, ExecutionMode &execution_mode) const; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/show_tables_executor.h b/src/observer/sql/executor/show_tables_executor.h index 97762ebdd..c1de1774c 100644 --- a/src/observer/sql/executor/show_tables_executor.h +++ b/src/observer/sql/executor/show_tables_executor.h @@ -58,4 +58,4 @@ class ShowTablesExecutor return RC::SUCCESS; } }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/sql_result.cpp b/src/observer/sql/executor/sql_result.cpp index 137f24825..2dd21c0aa 100644 --- a/src/observer/sql/executor/sql_result.cpp +++ b/src/observer/sql/executor/sql_result.cpp @@ -84,4 +84,4 @@ void SqlResult::set_operator(unique_ptr oper) operator_ = std::move(oper); operator_->tuple_schema(tuple_schema_); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/sql_result.h b/src/observer/sql/executor/sql_result.h index e517e43eb..9a1bc001a 100644 --- a/src/observer/sql/executor/sql_result.h +++ b/src/observer/sql/executor/sql_result.h @@ -59,4 +59,4 @@ class SqlResult RC return_code_ = RC::SUCCESS; string state_string_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/trx_begin_executor.h b/src/observer/sql/executor/trx_begin_executor.h index c78863aec..beb403774 100644 --- a/src/observer/sql/executor/trx_begin_executor.h +++ b/src/observer/sql/executor/trx_begin_executor.h @@ -44,4 +44,4 @@ class TrxBeginExecutor return trx->start_if_need(); } }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/executor/trx_end_executor.h b/src/observer/sql/executor/trx_end_executor.h index 227a0485a..258e88958 100644 --- a/src/observer/sql/executor/trx_end_executor.h +++ b/src/observer/sql/executor/trx_end_executor.h @@ -52,4 +52,4 @@ class TrxEndExecutor return rc; } }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/expr/aggregate_hash_table.cpp b/src/observer/sql/expr/aggregate_hash_table.cpp index 1bd973f59..2d8becacb 100644 --- a/src/observer/sql/expr/aggregate_hash_table.cpp +++ b/src/observer/sql/expr/aggregate_hash_table.cpp @@ -17,13 +17,13 @@ namespace oceanbase { RC StandardAggregateHashTable::add_chunk(Chunk &groups_chunk, Chunk &aggrs_chunk) { - if (groups_chunk.rows() != aggrs_chunk.rows()) { + if (groups_chunk.rows() != aggrs_chunk.rows()) { LOG_WARN("groups_chunk and aggrs_chunk have different rows: %d, %d", groups_chunk.rows(), aggrs_chunk.rows()); return RC::INVALID_ARGUMENT; } for (int i = 0; i < groups_chunk.rows(); i++) { - vector group_by_values; - vector aggr_values; + vector group_by_values; + vector aggr_values; for (int j = 0; j < groups_chunk.column_num(); j++) { group_by_values.emplace_back(groups_chunk.get_value(j, i)); @@ -32,18 +32,19 @@ RC StandardAggregateHashTable::add_chunk(Chunk &groups_chunk, Chunk &aggrs_chunk auto it = aggr_values_.find(group_by_values); if (it == aggr_values_.end()) { for (size_t j = 0; j < aggr_types_.size(); j++) { - void * state_ptr = create_aggregate_state(aggr_types_[j], aggr_child_types_[j]); + void *state_ptr = create_aggregate_state(aggr_types_[j], aggr_child_types_[j]); if (state_ptr == nullptr) { LOG_WARN("create aggregate state failed"); return RC::INTERNAL; - } + } aggr_values.emplace_back(state_ptr); } aggr_values_.emplace(group_by_values, aggr_values); } auto &aggr = aggr_values_.find(group_by_values)->second; for (size_t aggr_idx = 0; aggr_idx < aggr.size(); aggr_idx++) { - RC rc = aggregate_state_update_by_value(aggr[aggr_idx], aggr_types_[aggr_idx], aggr_child_types_[aggr_idx], aggrs_chunk.get_value(aggr_idx, i)); + RC rc = aggregate_state_update_by_value( + aggr[aggr_idx], aggr_types_[aggr_idx], aggr_child_types_[aggr_idx], aggrs_chunk.get_value(aggr_idx, i)); if (rc != RC::SUCCESS) { LOG_WARN("update aggregate state failed"); return rc; @@ -72,8 +73,10 @@ RC StandardAggregateHashTable::Scanner::next(Chunk &output_chunk) auto col_idx = output_chunk.column_ids(i); if (col_idx >= static_cast(group_by_values.size())) { int aggr_real_idx = col_idx - group_by_values.size(); - rc = finialize_aggregate_state(aggrs[aggr_real_idx], hash_table_->aggr_types_[aggr_real_idx], - hash_table_->aggr_child_types_[aggr_real_idx], output_chunk.column(i)); + rc = finialize_aggregate_state(aggrs[aggr_real_idx], + hash_table_->aggr_types_[aggr_real_idx], + hash_table_->aggr_child_types_[aggr_real_idx], + output_chunk.column(i)); if (rc != RC::SUCCESS) { LOG_WARN("finialize aggregate state failed"); return rc; @@ -267,16 +270,18 @@ void LinearProbingAggregateHashTable::add_batch(int *input_keys, V *input_val // off 全部初始化为 0 // for (; i + SIMD_WIDTH <= len;) { - // 1: 根据 `inv` 变量的值，从 `input_keys` 中 `selective load` `SIMD_WIDTH` 个不同的输入键值对。 - // 2. 计算 i += |inv|, `|inv|` 表示 `inv` 中有效的个数 - // 3. 计算 hash 值， - // 4. 根据聚合类型（目前只支持 sum），在哈希表中更新聚合结果。如果本次循环，没有找到key[i] 在哈希表中的位置，则不更新聚合结果。 - // 5. gather 操作，根据 hash 值将 keys_ 的 gather 结果写入 table_key 中。 - // 6. 更新 inv 和 off。如果本次循环key[i] 聚合完成，则inv[i]=-1，表示该位置在下次循环中读取新的键值对。 - // 如果本次循环 key[i] 未在哈希表中聚合完成（table_key[i] != key[i]），则inv[i] = 0，表示该位置在下次循环中不需要读取新的键值对。 - // 如果本次循环中，key[i]聚合完成，则off[i] 更新为 0，表示线性探测偏移量为 0，key[i] 未完成聚合，则off[i]++,表示线性探测偏移量加 1。 + // 1: 根据 `inv` 变量的值，从 `input_keys` 中 `selective load` `SIMD_WIDTH` 个不同的输入键值对。 + // 2. 计算 i += |inv|, `|inv|` 表示 `inv` 中有效的个数 + // 3. 计算 hash 值， + // 4. 根据聚合类型（目前只支持 sum），在哈希表中更新聚合结果。如果本次循环，没有找到key[i] + // 在哈希表中的位置，则不更新聚合结果。 + // 5. gather 操作，根据 hash 值将 keys_ 的 gather 结果写入 table_key 中。 + // 6. 更新 inv 和 off。如果本次循环key[i] 聚合完成，则inv[i]=-1，表示该位置在下次循环中读取新的键值对。 + // 如果本次循环 key[i] 未在哈希表中聚合完成（table_key[i] != key[i]），则inv[i] = + // 0，表示该位置在下次循环中不需要读取新的键值对。 如果本次循环中，key[i]聚合完成，则off[i] 更新为 + // 0，表示线性探测偏移量为 0，key[i] 未完成聚合，则off[i]++,表示线性探测偏移量加 1。 // } - //7. 通过标量线性探测，处理剩余键值对 + // 7. 通过标量线性探测，处理剩余键值对 // resize_if_need(); } @@ -289,4 +294,4 @@ const int LinearProbingAggregateHashTable::DEFAULT_CAPACITY = 16384; template class LinearProbingAggregateHashTable; template class LinearProbingAggregateHashTable; #endif -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/expr/aggregate_hash_table.h b/src/observer/sql/expr/aggregate_hash_table.h index 927e2aa2b..a77054ee5 100644 --- a/src/observer/sql/expr/aggregate_hash_table.h +++ b/src/observer/sql/expr/aggregate_hash_table.h @@ -178,4 +178,4 @@ class LinearProbingAggregateHashTable : public AggregateHashTable AggregateExpr::Type aggregate_type_; }; #endif // USE_SIMD -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/expr/aggregate_state.cpp b/src/observer/sql/expr/aggregate_state.cpp index 7401d6b4b..5e49e7cfe 100644 --- a/src/observer/sql/expr/aggregate_state.cpp +++ b/src/observer/sql/expr/aggregate_state.cpp @@ -28,7 +28,7 @@ void SumState::update(const T *values, int size) } #else for (int i = 0; i < size; ++i) { - value += values[i]; + value += values[i]; } #endif } @@ -37,7 +37,7 @@ template void AvgState::update(const T *values, int size) { for (int i = 0; i < size; ++i) { - value += values[i]; + value += values[i]; } count += size; } @@ -48,9 +48,9 @@ void CountState::update(const T *values, int size) value += size; } -void* create_aggregate_state(AggregateExpr::Type aggr_type, AttrType attr_type) +void *create_aggregate_state(AggregateExpr::Type aggr_type, AttrType attr_type) { - void* state_ptr = nullptr; + void *state_ptr = nullptr; if (aggr_type == AggregateExpr::Type::SUM) { if (attr_type == AttrType::INTS) { state_ptr = malloc(sizeof(SumState)); @@ -80,25 +80,25 @@ void* create_aggregate_state(AggregateExpr::Type aggr_type, AttrType attr_type) return state_ptr; } -RC aggregate_state_update_by_value(void *state, AggregateExpr::Type aggr_type, AttrType attr_type, const Value& val) +RC aggregate_state_update_by_value(void *state, AggregateExpr::Type aggr_type, AttrType attr_type, const Value &val) { RC rc = RC::SUCCESS; if (aggr_type == AggregateExpr::Type::SUM) { if (attr_type == AttrType::INTS) { - static_cast*>(state)->update(val.get_int()); + static_cast *>(state)->update(val.get_int()); } else if (attr_type == AttrType::FLOATS) { - static_cast*>(state)->update(val.get_float()); + static_cast *>(state)->update(val.get_float()); } else { LOG_WARN("unsupported aggregate value type"); return RC::UNIMPLEMENTED; } } else if (aggr_type == AggregateExpr::Type::COUNT) { - static_cast*>(state)->update(1); + static_cast *>(state)->update(1); } else if (aggr_type == AggregateExpr::Type::AVG) { if (attr_type == AttrType::INTS) { - static_cast*>(state)->update(val.get_int()); + static_cast *>(state)->update(val.get_int()); } else if (attr_type == AttrType::FLOATS) { - static_cast*>(state)->update(val.get_float()); + static_cast *>(state)->update(val.get_float()); } else { LOG_WARN("unsupported aggregate value type"); return RC::UNIMPLEMENTED; @@ -114,14 +114,14 @@ template void append_to_column(void *state, Column &column) { STATE *state_ptr = reinterpret_cast(state); - T res = state_ptr->template finalize(); + T res = state_ptr->template finalize(); column.append_one((char *)&res); } -RC finialize_aggregate_state(void *state, AggregateExpr::Type aggr_type, AttrType attr_type, Column& col) +RC finialize_aggregate_state(void *state, AggregateExpr::Type aggr_type, AttrType attr_type, Column &col) { RC rc = RC::SUCCESS; - if ( aggr_type == AggregateExpr::Type::SUM) { + if (aggr_type == AggregateExpr::Type::SUM) { if (attr_type == AttrType::INTS) { append_to_column, int>(state, col); } else if (attr_type == AttrType::FLOATS) { @@ -140,7 +140,7 @@ RC finialize_aggregate_state(void *state, AggregateExpr::Type aggr_type, AttrTyp } else { rc = RC::UNIMPLEMENTED; LOG_WARN("unsupported aggregate value type"); - }// + } // } else { rc = RC::UNIMPLEMENTED; LOG_WARN("unsupported aggregator type"); @@ -152,11 +152,11 @@ template void update_aggregate_state(void *state, const Column &column) { STATE *state_ptr = reinterpret_cast(state); - T * data = (T *)column.data(); + T *data = (T *)column.data(); state_ptr->update(data, column.count()); } -RC aggregate_state_update_by_column(void *state, AggregateExpr::Type aggr_type, AttrType attr_type, Column& col) +RC aggregate_state_update_by_column(void *state, AggregateExpr::Type aggr_type, AttrType attr_type, Column &col) { RC rc = RC::SUCCESS; if (aggr_type == AggregateExpr::Type::SUM) { @@ -193,4 +193,4 @@ template class CountState; template class AvgState; template class AvgState; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/expr/aggregate_state.h b/src/observer/sql/expr/aggregate_state.h index 2e4c4b553..3e2b63a0d 100644 --- a/src/observer/sql/expr/aggregate_state.h +++ b/src/observer/sql/expr/aggregate_state.h @@ -69,4 +69,4 @@ RC aggregate_state_update_by_value(void *state, AggregateExpr::Type aggr_type, A RC aggregate_state_update_by_column(void *state, AggregateExpr::Type aggr_type, AttrType attr_type, Column &col); RC finialize_aggregate_state(void *state, AggregateExpr::Type aggr_type, AttrType attr_type, Column &col); -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/expr/aggregator.cpp b/src/observer/sql/expr/aggregator.cpp index 20fdccf68..1a6446b18 100644 --- a/src/observer/sql/expr/aggregator.cpp +++ b/src/observer/sql/expr/aggregator.cpp @@ -23,17 +23,17 @@ RC SumAggregator::accumulate(const Value &value) value_ = value; return RC::SUCCESS; } - + ASSERT(value.attr_type() == value_.attr_type(), "type mismatch. value type: %s, value_.type: %s", attr_type_to_string(value.attr_type()), attr_type_to_string(value_.attr_type())); - + Value::add(value, value_, value_); return RC::SUCCESS; } -RC SumAggregator::evaluate(Value& result) +RC SumAggregator::evaluate(Value &result) { result = value_; return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/expr/aggregator.h b/src/observer/sql/expr/aggregator.h index e57d35e63..f78f89b6e 100644 --- a/src/observer/sql/expr/aggregator.h +++ b/src/observer/sql/expr/aggregator.h @@ -37,4 +37,4 @@ class SumAggregator : public Aggregator RC accumulate(const Value &value) override; RC evaluate(Value &result) override; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/expr/composite_tuple.cpp b/src/observer/sql/expr/composite_tuple.cpp index 880a5bd72..09d69eda2 100644 --- a/src/observer/sql/expr/composite_tuple.cpp +++ b/src/observer/sql/expr/composite_tuple.cpp @@ -66,9 +66,9 @@ RC CompositeTuple::find_cell(const TupleCellSpec &spec, Value &cell) const void CompositeTuple::add_tuple(unique_ptr tuple) { tuples_.push_back(std::move(tuple)); } -Tuple &CompositeTuple::tuple_at(size_t index) -{ +Tuple &CompositeTuple::tuple_at(size_t index) +{ ASSERT(index < tuples_.size(), "index=%d, tuples_size=%d", index, tuples_.size()); - return *tuples_[index]; + return *tuples_[index]; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/expr/composite_tuple.h b/src/observer/sql/expr/composite_tuple.h index 0641581e8..ffd6b702f 100644 --- a/src/observer/sql/expr/composite_tuple.h +++ b/src/observer/sql/expr/composite_tuple.h @@ -50,4 +50,4 @@ class CompositeTuple : public Tuple private: vector> tuples_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/expr/expression.cpp b/src/observer/sql/expr/expression.cpp index ab058afc4..e0163b160 100644 --- a/src/observer/sql/expr/expression.cpp +++ b/src/observer/sql/expr/expression.cpp @@ -93,7 +93,7 @@ RC CastExpr::cast(const Value &value, Value &cast_value) const RC CastExpr::get_value(const Tuple &tuple, Value &result) const { Value value; - RC rc = child_->get_value(tuple, value); + RC rc = child_->get_value(tuple, value); if (rc != RC::SUCCESS) { return rc; } @@ -104,7 +104,7 @@ RC CastExpr::get_value(const Tuple &tuple, Value &result) const RC CastExpr::get_column(Chunk &chunk, Column &column) { Column child_column; - RC rc = child_->get_column(chunk, child_column); + RC rc = child_->get_column(chunk, child_column); if (rc != RC::SUCCESS) { return rc; } @@ -124,7 +124,7 @@ RC CastExpr::get_column(Chunk &chunk, Column &column) RC CastExpr::try_get_value(Value &result) const { Value value; - RC rc = child_->try_get_value(value); + RC rc = child_->try_get_value(value); if (rc != RC::SUCCESS) { return rc; } @@ -136,8 +136,7 @@ RC CastExpr::try_get_value(Value &result) const ComparisonExpr::ComparisonExpr(CompOp comp, unique_ptr left, unique_ptr right) : comp_(comp), left_(std::move(left)), right_(std::move(right)) -{ -} +{} ComparisonExpr::~ComparisonExpr() {} @@ -177,8 +176,8 @@ RC ComparisonExpr::compare_value(const Value &left, const Value &right, bool &re RC ComparisonExpr::try_get_value(Value &cell) const { if (left_->type() == ExprType::VALUE && right_->type() == ExprType::VALUE) { - ValueExpr * left_value_expr = static_cast(left_.get()); - ValueExpr * right_value_expr = static_cast(right_.get()); + ValueExpr *left_value_expr = static_cast(left_.get()); + ValueExpr *right_value_expr = static_cast(right_.get()); const Value &left_cell = left_value_expr->get_value(); const Value &right_cell = right_value_expr->get_value(); @@ -252,10 +251,10 @@ RC ComparisonExpr::eval(Chunk &chunk, vector &select) rows = left_column.count(); } for (int i = 0; i < rows; ++i) { - Value left_val = left_column.get_value(i); + Value left_val = left_column.get_value(i); Value right_val = right_column.get_value(i); - bool result = false; - rc = compare_value(left_val, right_val, result); + bool result = false; + rc = compare_value(left_val, right_val, result); if (rc != RC::SUCCESS) { LOG_WARN("failed to compare tuple cells. rc=%s", strrc(rc)); return rc; @@ -348,8 +347,7 @@ AttrType ArithmeticExpr::value_type() const return left_->value_type(); } - if ((left_->value_type() == AttrType::INTS) && - (right_->value_type() == AttrType::INTS) && + if ((left_->value_type() == AttrType::INTS) && (right_->value_type() == AttrType::INTS) && arithmetic_type_ != Type::DIV) { return AttrType::INTS; } @@ -630,4 +628,4 @@ RC AggregateExpr::type_from_string(const char *type_str, AggregateExpr::Type &ty } return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/expr/expression.h b/src/observer/sql/expr/expression.h index 5b2868c6d..2216c1591 100644 --- a/src/observer/sql/expr/expression.h +++ b/src/observer/sql/expr/expression.h @@ -530,4 +530,4 @@ class AggregateExpr : public Expression Type aggregate_type_; unique_ptr child_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/expr/expression_iterator.cpp b/src/observer/sql/expr/expression_iterator.cpp index e46f6adbe..4a98ba2e2 100644 --- a/src/observer/sql/expr/expression_iterator.cpp +++ b/src/observer/sql/expr/expression_iterator.cpp @@ -27,13 +27,13 @@ RC ExpressionIterator::iterate_child_expr(Expression &expr, function(expr); - rc = callback(cast_expr.child()); + rc = callback(cast_expr.child()); } break; case ExprType::COMPARISON: { auto &comparison_expr = static_cast(expr); - rc = callback(comparison_expr.left()); + rc = callback(comparison_expr.left()); if (OB_SUCC(rc)) { rc = callback(comparison_expr.right()); @@ -54,7 +54,7 @@ RC ExpressionIterator::iterate_child_expr(Expression &expr, function(expr); - rc = callback(arithmetic_expr.left()); + rc = callback(arithmetic_expr.left()); if (OB_SUCC(rc)) { rc = callback(arithmetic_expr.right()); } @@ -62,7 +62,7 @@ RC ExpressionIterator::iterate_child_expr(Expression &expr, function(expr); - rc = callback(aggregate_expr.child()); + rc = callback(aggregate_expr.child()); } break; case ExprType::NONE: @@ -80,4 +80,4 @@ RC ExpressionIterator::iterate_child_expr(Expression &expr, function &)> callback); }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/expr/expression_tuple.h b/src/observer/sql/expr/expression_tuple.h index 9946e55d7..96cf78632 100644 --- a/src/observer/sql/expr/expression_tuple.h +++ b/src/observer/sql/expr/expression_tuple.h @@ -90,4 +90,4 @@ class ExpressionTuple : public Tuple const vector &expressions_; const Tuple *child_tuple_ = nullptr; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/expr/tuple.h b/src/observer/sql/expr/tuple.h index 1c5380a0f..c76aab11f 100644 --- a/src/observer/sql/expr/tuple.h +++ b/src/observer/sql/expr/tuple.h @@ -442,4 +442,4 @@ class JoinedTuple : public Tuple Tuple *left_ = nullptr; Tuple *right_ = nullptr; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/expr/tuple_cell.cpp b/src/observer/sql/expr/tuple_cell.cpp index 57617cc40..419630093 100644 --- a/src/observer/sql/expr/tuple_cell.cpp +++ b/src/observer/sql/expr/tuple_cell.cpp @@ -45,6 +45,5 @@ TupleCellSpec::TupleCellSpec(const char *alias) } } -TupleCellSpec::TupleCellSpec(const string &alias) : alias_(alias) -{} -} \ No newline at end of file +TupleCellSpec::TupleCellSpec(const string &alias) : alias_(alias) {} +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/expr/tuple_cell.h b/src/observer/sql/expr/tuple_cell.h index 844ee7e2d..88172922a 100644 --- a/src/observer/sql/expr/tuple_cell.h +++ b/src/observer/sql/expr/tuple_cell.h @@ -40,4 +40,4 @@ class TupleCellSpec final string field_name_; string alias_; }; -} //namespace oceanbase \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/aggregate_vec_physical_operator.cpp b/src/observer/sql/operator/aggregate_vec_physical_operator.cpp index e93ebc116..e20ca8db6 100644 --- a/src/observer/sql/operator/aggregate_vec_physical_operator.cpp +++ b/src/observer/sql/operator/aggregate_vec_physical_operator.cpp @@ -25,7 +25,7 @@ AggregateVecPhysicalOperator::AggregateVecPhysicalOperator(vector value_expressions_.reserve(aggregate_expressions_.size()); ranges::for_each(aggregate_expressions_, [this](Expression *expr) { - auto * aggregate_expr = static_cast(expr); + auto *aggregate_expr = static_cast(expr); Expression *child_expr = aggregate_expr->child().get(); ASSERT(child_expr != nullptr, "aggregation expression must have a child expression"); value_expressions_.emplace_back(child_expr); @@ -59,7 +59,8 @@ RC AggregateVecPhysicalOperator::open(Trx *trx) value_expressions_[aggr_idx]->get_column(chunk_, column); ASSERT(aggregate_expressions_[aggr_idx]->type() == ExprType::AGGREGATION, "expect aggregate expression"); auto *aggregate_expr = static_cast(aggregate_expressions_[aggr_idx]); - rc = aggregate_state_update_by_column(aggr_values_.at(aggr_idx), aggregate_expr->aggregate_type(), aggregate_expr->child()->value_type(), column); + rc = aggregate_state_update_by_column( + aggr_values_.at(aggr_idx), aggregate_expr->aggregate_type(), aggregate_expr->child()->value_type(), column); if (OB_FAIL(rc)) { LOG_INFO("failed to update aggregate state. rc=%s", strrc(rc)); return rc; @@ -78,7 +79,7 @@ template void AggregateVecPhysicalOperator::update_aggregate_state(void *state, const Column &column) { STATE *state_ptr = reinterpret_cast(state); - T * data = (T *)column.data(); + T *data = (T *)column.data(); state_ptr->update(data, column.count()); } @@ -91,7 +92,10 @@ RC AggregateVecPhysicalOperator::next(Chunk &chunk) auto pos = i; ASSERT(aggregate_expressions_[pos]->type() == ExprType::AGGREGATION, "expect aggregation expression"); auto *aggregate_expr = static_cast(aggregate_expressions_[pos]); - RC rc = finialize_aggregate_state(aggr_values_.at(pos), aggregate_expr->aggregate_type(), aggregate_expr->child()->value_type(), output_chunk_.column(i)); + RC rc = finialize_aggregate_state(aggr_values_.at(pos), + aggregate_expr->aggregate_type(), + aggregate_expr->child()->value_type(), + output_chunk_.column(i)); if (OB_FAIL(rc)) { LOG_INFO("failed to finialize aggregate state. rc=%s", strrc(rc)); return rc; @@ -110,4 +114,4 @@ RC AggregateVecPhysicalOperator::close() LOG_INFO("close group by operator"); return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/aggregate_vec_physical_operator.h b/src/observer/sql/operator/aggregate_vec_physical_operator.h index d0d7d7c46..f7911ce15 100644 --- a/src/observer/sql/operator/aggregate_vec_physical_operator.h +++ b/src/observer/sql/operator/aggregate_vec_physical_operator.h @@ -68,4 +68,4 @@ class AggregateVecPhysicalOperator : public PhysicalOperator AggregateValues aggr_values_; bool outputed_ = false; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/calc_logical_operator.h b/src/observer/sql/operator/calc_logical_operator.h index a7c1d632f..caf2ac751 100644 --- a/src/observer/sql/operator/calc_logical_operator.h +++ b/src/observer/sql/operator/calc_logical_operator.h @@ -31,4 +31,4 @@ class CalcLogicalOperator : public LogicalOperator LogicalOperatorType type() const override { return LogicalOperatorType::CALC; } OpType get_op_type() const override { return OpType::LOGICALCALCULATE; } }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/calc_physical_operator.h b/src/observer/sql/operator/calc_physical_operator.h index 3343a58b4..6d64f0fb8 100644 --- a/src/observer/sql/operator/calc_physical_operator.h +++ b/src/observer/sql/operator/calc_physical_operator.h @@ -75,4 +75,4 @@ class CalcPhysicalOperator : public PhysicalOperator ExpressionTuple> tuple_; bool emitted_ = false; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/delete_logical_operator.cpp b/src/observer/sql/operator/delete_logical_operator.cpp index eeb0f316f..2952796ba 100644 --- a/src/observer/sql/operator/delete_logical_operator.cpp +++ b/src/observer/sql/operator/delete_logical_operator.cpp @@ -17,4 +17,4 @@ See the Mulan PSL v2 for more details. */ namespace oceanbase { DeleteLogicalOperator::DeleteLogicalOperator(Table *table) : table_(table) {} -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/delete_logical_operator.h b/src/observer/sql/operator/delete_logical_operator.h index 919501165..848a58c6a 100644 --- a/src/observer/sql/operator/delete_logical_operator.h +++ b/src/observer/sql/operator/delete_logical_operator.h @@ -35,4 +35,4 @@ class DeleteLogicalOperator : public LogicalOperator private: Table *table_ = nullptr; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/delete_physical_operator.cpp b/src/observer/sql/operator/delete_physical_operator.cpp index 274446bc1..fe3d1e715 100644 --- a/src/observer/sql/operator/delete_physical_operator.cpp +++ b/src/observer/sql/operator/delete_physical_operator.cpp @@ -62,13 +62,7 @@ RC DeletePhysicalOperator::open(Trx *trx) return RC::SUCCESS; } -RC DeletePhysicalOperator::next() -{ - return RC::RECORD_EOF; -} +RC DeletePhysicalOperator::next() { return RC::RECORD_EOF; } -RC DeletePhysicalOperator::close() -{ - return RC::SUCCESS; -} -} \ No newline at end of file +RC DeletePhysicalOperator::close() { return RC::SUCCESS; } +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/delete_physical_operator.h b/src/observer/sql/operator/delete_physical_operator.h index b0e29ad91..28d910ffd 100644 --- a/src/observer/sql/operator/delete_physical_operator.h +++ b/src/observer/sql/operator/delete_physical_operator.h @@ -47,4 +47,4 @@ class DeletePhysicalOperator : public PhysicalOperator Trx *trx_ = nullptr; vector records_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/explain_logical_operator.h b/src/observer/sql/operator/explain_logical_operator.h index 9f93151c7..2b53e7fc4 100644 --- a/src/observer/sql/operator/explain_logical_operator.h +++ b/src/observer/sql/operator/explain_logical_operator.h @@ -32,4 +32,4 @@ class ExplainLogicalOperator : public LogicalOperator OpType get_op_type() const override { return OpType::LOGICALEXPLAIN; } }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/explain_physical_operator.cpp b/src/observer/sql/operator/explain_physical_operator.cpp index 34a082181..3f565df6c 100644 --- a/src/observer/sql/operator/explain_physical_operator.cpp +++ b/src/observer/sql/operator/explain_physical_operator.cpp @@ -55,12 +55,12 @@ RC ExplainPhysicalOperator::next(Chunk &chunk) } generate_physical_plan(); - Value cell(physical_plan_.c_str()); - auto column = make_unique(); + Value cell(physical_plan_.c_str()); + auto column = make_unique(); column->init(cell, chunk.rows()); chunk.add_column(std::move(column), 0); return RC::SUCCESS; } Tuple *ExplainPhysicalOperator::current_tuple() { return &tuple_; } -} +} // namespace oceanbase diff --git a/src/observer/sql/operator/explain_physical_operator.h b/src/observer/sql/operator/explain_physical_operator.h index cbcc85076..038850619 100644 --- a/src/observer/sql/operator/explain_physical_operator.h +++ b/src/observer/sql/operator/explain_physical_operator.h @@ -56,4 +56,4 @@ class ExplainPhysicalOperator : public PhysicalOperator string physical_plan_; ValueListTuple tuple_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/expr_vec_physical_operator.cpp b/src/observer/sql/operator/expr_vec_physical_operator.cpp index e767b46f6..dd9c03b0f 100644 --- a/src/observer/sql/operator/expr_vec_physical_operator.cpp +++ b/src/observer/sql/operator/expr_vec_physical_operator.cpp @@ -62,4 +62,4 @@ RC ExprVecPhysicalOperator::close() LOG_INFO("close group by operator"); return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/expr_vec_physical_operator.h b/src/observer/sql/operator/expr_vec_physical_operator.h index 525c6efd9..505ad0e6c 100644 --- a/src/observer/sql/operator/expr_vec_physical_operator.h +++ b/src/observer/sql/operator/expr_vec_physical_operator.h @@ -36,4 +36,4 @@ class ExprVecPhysicalOperator : public PhysicalOperator Chunk chunk_; Chunk evaled_chunk_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/group_by_logical_operator.cpp b/src/observer/sql/operator/group_by_logical_operator.cpp index 88712d85e..3ac7cfe91 100644 --- a/src/observer/sql/operator/group_by_logical_operator.cpp +++ b/src/observer/sql/operator/group_by_logical_operator.cpp @@ -20,10 +20,10 @@ using namespace std; namespace oceanbase { -GroupByLogicalOperator::GroupByLogicalOperator(vector> &&group_by_exprs, - vector &&expressions) +GroupByLogicalOperator::GroupByLogicalOperator( + vector> &&group_by_exprs, vector &&expressions) { - group_by_expressions_ = std::move(group_by_exprs); + group_by_expressions_ = std::move(group_by_exprs); aggregate_expressions_ = std::move(expressions); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/group_by_logical_operator.h b/src/observer/sql/operator/group_by_logical_operator.h index ee949033c..e3248d188 100644 --- a/src/observer/sql/operator/group_by_logical_operator.h +++ b/src/observer/sql/operator/group_by_logical_operator.h @@ -35,4 +35,4 @@ class GroupByLogicalOperator : public LogicalOperator vector> group_by_expressions_; vector aggregate_expressions_; ///< 输出的表达式，可能包含聚合函数 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/group_by_physical_operator.cpp b/src/observer/sql/operator/group_by_physical_operator.cpp index 07ce4f688..3457be317 100644 --- a/src/observer/sql/operator/group_by_physical_operator.cpp +++ b/src/observer/sql/operator/group_by_physical_operator.cpp @@ -104,4 +104,4 @@ RC GroupByPhysicalOperator::evaluate(GroupValueType &group_value) return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/group_by_physical_operator.h b/src/observer/sql/operator/group_by_physical_operator.h index ff226ab07..48a07ed82 100644 --- a/src/observer/sql/operator/group_by_physical_operator.h +++ b/src/observer/sql/operator/group_by_physical_operator.h @@ -58,4 +58,4 @@ class GroupByPhysicalOperator : public PhysicalOperator vector aggregate_expressions_; /// 聚合表达式 vector value_expressions_; /// 计算聚合时的表达式 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/group_by_vec_physical_operator.h b/src/observer/sql/operator/group_by_vec_physical_operator.h index de6b5cd90..3889a5e12 100644 --- a/src/observer/sql/operator/group_by_vec_physical_operator.h +++ b/src/observer/sql/operator/group_by_vec_physical_operator.h @@ -22,7 +22,7 @@ namespace oceanbase { class GroupByVecPhysicalOperator : public PhysicalOperator { public: - GroupByVecPhysicalOperator(vector> &&group_by_exprs, vector &&expressions){}; + GroupByVecPhysicalOperator(vector> &&group_by_exprs, vector &&expressions) {}; virtual ~GroupByVecPhysicalOperator() = default; @@ -34,4 +34,4 @@ class GroupByVecPhysicalOperator : public PhysicalOperator private: }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/hash_group_by_physical_operator.cpp b/src/observer/sql/operator/hash_group_by_physical_operator.cpp index cc0b46c29..e8bb88c1e 100644 --- a/src/observer/sql/operator/hash_group_by_physical_operator.cpp +++ b/src/observer/sql/operator/hash_group_by_physical_operator.cpp @@ -25,8 +25,7 @@ namespace oceanbase { HashGroupByPhysicalOperator::HashGroupByPhysicalOperator( vector> &&group_by_exprs, vector &&expressions) : GroupByPhysicalOperator(std::move(expressions)), group_by_exprs_(std::move(group_by_exprs)) -{ -} +{} RC HashGroupByPhysicalOperator::open(Trx *trx) { @@ -63,7 +62,7 @@ RC HashGroupByPhysicalOperator::open(Trx *trx) // 计算聚合值 GroupValueType &group_value = get<1>(*found_group); - rc = aggregate(get<0>(group_value), group_value_expression_tuple); + rc = aggregate(get<0>(group_value), group_value_expression_tuple); if (OB_FAIL(rc)) { LOG_WARN("failed to aggregate values. rc=%s", strrc(rc)); return rc; @@ -82,7 +81,7 @@ RC HashGroupByPhysicalOperator::open(Trx *trx) // 得到最终聚合后的值 for (GroupType &group : groups_) { GroupValueType &group_value = get<1>(group); - rc = evaluate(group_value); + rc = evaluate(group_value); if (OB_FAIL(rc)) { LOG_WARN("failed to evaluate group value. rc=%s", strrc(rc)); return rc; @@ -172,11 +171,11 @@ RC HashGroupByPhysicalOperator::find_group(const Tuple &child_tuple, GroupType * CompositeTuple composite_tuple; composite_tuple.add_tuple(make_unique(std::move(child_tuple_to_value))); - groups_.emplace_back(std::move(group_by_evaluated_tuple), - GroupValueType(std::move(aggregator_list), std::move(composite_tuple))); + groups_.emplace_back( + std::move(group_by_evaluated_tuple), GroupValueType(std::move(aggregator_list), std::move(composite_tuple))); found_group = &groups_.back(); } return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/hash_group_by_physical_operator.h b/src/observer/sql/operator/hash_group_by_physical_operator.h index a56581b0d..db85d63f3 100644 --- a/src/observer/sql/operator/hash_group_by_physical_operator.h +++ b/src/observer/sql/operator/hash_group_by_physical_operator.h @@ -62,4 +62,4 @@ class HashGroupByPhysicalOperator : public GroupByPhysicalOperator vector::iterator current_group_; bool first_emited_ = false; /// 第一条数据是否已经输出 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/hash_join_physical_operator.h b/src/observer/sql/operator/hash_join_physical_operator.h index da4474eb3..287ce0958 100644 --- a/src/observer/sql/operator/hash_join_physical_operator.h +++ b/src/observer/sql/operator/hash_join_physical_operator.h @@ -21,4 +21,4 @@ namespace oceanbase { */ class HashJoinPhysicalOperator {}; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/index_scan_physical_operator.cpp b/src/observer/sql/operator/index_scan_physical_operator.cpp index c70dcc21c..cb78d9bb4 100644 --- a/src/observer/sql/operator/index_scan_physical_operator.cpp +++ b/src/observer/sql/operator/index_scan_physical_operator.cpp @@ -18,13 +18,9 @@ See the Mulan PSL v2 for more details. */ namespace oceanbase { -IndexScanPhysicalOperator::IndexScanPhysicalOperator(Table *table, Index *index, ReadWriteMode mode, const Value *left_value, - bool left_inclusive, const Value *right_value, bool right_inclusive) - : table_(table), - index_(index), - mode_(mode), - left_inclusive_(left_inclusive), - right_inclusive_(right_inclusive) +IndexScanPhysicalOperator::IndexScanPhysicalOperator(Table *table, Index *index, ReadWriteMode mode, + const Value *left_value, bool left_inclusive, const Value *right_value, bool right_inclusive) + : table_(table), index_(index), mode_(mode), left_inclusive_(left_inclusive), right_inclusive_(right_inclusive) { if (left_value) { left_value_ = *left_value; @@ -141,4 +137,4 @@ string IndexScanPhysicalOperator::param() const { return string(index_->index_meta().name()) + " ON " + table_->name(); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/index_scan_physical_operator.h b/src/observer/sql/operator/index_scan_physical_operator.h index 1fc9e09e1..1d37b99ff 100644 --- a/src/observer/sql/operator/index_scan_physical_operator.h +++ b/src/observer/sql/operator/index_scan_physical_operator.h @@ -65,4 +65,4 @@ class IndexScanPhysicalOperator : public PhysicalOperator vector> predicates_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/insert_logical_operator.cpp b/src/observer/sql/operator/insert_logical_operator.cpp index 8357d032b..6b8824eef 100644 --- a/src/observer/sql/operator/insert_logical_operator.cpp +++ b/src/observer/sql/operator/insert_logical_operator.cpp @@ -16,6 +16,5 @@ See the Mulan PSL v2 for more details. */ namespace oceanbase { -InsertLogicalOperator::InsertLogicalOperator(Table *table, vector values) : table_(table), values_(values) -{} -} \ No newline at end of file +InsertLogicalOperator::InsertLogicalOperator(Table *table, vector values) : table_(table), values_(values) {} +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/insert_logical_operator.h b/src/observer/sql/operator/insert_logical_operator.h index 4f0022df4..6e2f23072 100644 --- a/src/observer/sql/operator/insert_logical_operator.h +++ b/src/observer/sql/operator/insert_logical_operator.h @@ -41,4 +41,4 @@ class InsertLogicalOperator : public LogicalOperator Table *table_ = nullptr; vector values_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/insert_physical_operator.cpp b/src/observer/sql/operator/insert_physical_operator.cpp index b799c5dc0..31376b9c8 100644 --- a/src/observer/sql/operator/insert_physical_operator.cpp +++ b/src/observer/sql/operator/insert_physical_operator.cpp @@ -44,4 +44,4 @@ RC InsertPhysicalOperator::open(Trx *trx) RC InsertPhysicalOperator::next() { return RC::RECORD_EOF; } RC InsertPhysicalOperator::close() { return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/insert_physical_operator.h b/src/observer/sql/operator/insert_physical_operator.h index f3635a2b2..cf5bb2e68 100644 --- a/src/observer/sql/operator/insert_physical_operator.h +++ b/src/observer/sql/operator/insert_physical_operator.h @@ -46,4 +46,4 @@ class InsertPhysicalOperator : public PhysicalOperator Table *table_ = nullptr; vector values_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/join_logical_operator.h b/src/observer/sql/operator/join_logical_operator.h index bbd1557f1..02bc85451 100644 --- a/src/observer/sql/operator/join_logical_operator.h +++ b/src/observer/sql/operator/join_logical_operator.h @@ -75,4 +75,4 @@ class JoinLogicalOperator : public LogicalOperator LogicalOperator *predicate_op_ = nullptr; std::vector> join_predicates_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/join_physical_operator.cpp b/src/observer/sql/operator/join_physical_operator.cpp index 2bf3593e8..6d4216490 100644 --- a/src/observer/sql/operator/join_physical_operator.cpp +++ b/src/observer/sql/operator/join_physical_operator.cpp @@ -133,4 +133,4 @@ RC NestedLoopJoinPhysicalOperator::right_next() joined_tuple_.set_right(right_tuple_); return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/join_physical_operator.h b/src/observer/sql/operator/join_physical_operator.h index dc48d9056..1cd46f717 100644 --- a/src/observer/sql/operator/join_physical_operator.h +++ b/src/observer/sql/operator/join_physical_operator.h @@ -53,4 +53,4 @@ class NestedLoopJoinPhysicalOperator : public PhysicalOperator bool round_done_ = true; //! 右表遍历的一轮是否结束 bool right_closed_ = true; //! 右表算子是否已经关闭 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/logical_operator.cpp b/src/observer/sql/operator/logical_operator.cpp index 4aa24db45..87ac2248e 100644 --- a/src/observer/sql/operator/logical_operator.cpp +++ b/src/observer/sql/operator/logical_operator.cpp @@ -18,24 +18,17 @@ namespace oceanbase { LogicalOperator::~LogicalOperator() {} -void LogicalOperator::add_child(unique_ptr oper) { - children_.emplace_back(std::move(oper)); -} +void LogicalOperator::add_child(unique_ptr oper) { children_.emplace_back(std::move(oper)); } void LogicalOperator::add_expressions(unique_ptr expr) { expressions_.emplace_back(std::move(expr)); } bool LogicalOperator::can_generate_vectorized_operator(const LogicalOperatorType &type) { bool bool_ret = false; - switch (type) - { - case LogicalOperatorType::CALC: - case LogicalOperatorType::DELETE: - case LogicalOperatorType::INSERT: - bool_ret = false; - break; - - default: - bool_ret = true; - break; + switch (type) { + case LogicalOperatorType::CALC: + case LogicalOperatorType::DELETE: + case LogicalOperatorType::INSERT: bool_ret = false; break; + + default: bool_ret = true; break; } return bool_ret; } @@ -47,4 +40,4 @@ void LogicalOperator::generate_general_child() child->generate_general_child(); } } -} +} // namespace oceanbase diff --git a/src/observer/sql/operator/logical_operator.h b/src/observer/sql/operator/logical_operator.h index f6ba86721..dd8ff4993 100644 --- a/src/observer/sql/operator/logical_operator.h +++ b/src/observer/sql/operator/logical_operator.h @@ -74,4 +74,4 @@ class LogicalOperator : public OperatorNode ///< 表达式能是一个常量，也可以是一个函数，也可以是一个列，也可以是一个子查询等等 vector> expressions_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/nested_loop_join_physical_operator.cpp b/src/observer/sql/operator/nested_loop_join_physical_operator.cpp index f37d1a17a..24c7b62c5 100644 --- a/src/observer/sql/operator/nested_loop_join_physical_operator.cpp +++ b/src/observer/sql/operator/nested_loop_join_physical_operator.cpp @@ -38,7 +38,7 @@ RC NestedLoopJoinPhysicalOperator::open(Trx *trx) RC NestedLoopJoinPhysicalOperator::next() { - RC rc = RC::SUCCESS; + RC rc = RC::SUCCESS; while (RC::SUCCESS == rc) { bool left_need_step = (left_tuple_ == nullptr); if (round_done_) { @@ -55,7 +55,7 @@ RC NestedLoopJoinPhysicalOperator::next() rc = right_next(); if (rc != RC::SUCCESS) { if (rc == RC::RECORD_EOF) { - rc = RC::SUCCESS; + rc = RC::SUCCESS; round_done_ = true; continue; } else { @@ -133,4 +133,4 @@ RC NestedLoopJoinPhysicalOperator::right_next() joined_tuple_.set_right(right_tuple_); return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/nested_loop_join_physical_operator.h b/src/observer/sql/operator/nested_loop_join_physical_operator.h index 13bb8314d..edb979f25 100644 --- a/src/observer/sql/operator/nested_loop_join_physical_operator.h +++ b/src/observer/sql/operator/nested_loop_join_physical_operator.h @@ -64,4 +64,4 @@ class NestedLoopJoinPhysicalOperator : public PhysicalOperator bool round_done_ = true; //! 右表遍历的一轮是否结束 bool right_closed_ = true; //! 右表算子是否已经关闭 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/operator_node.h b/src/observer/sql/operator/operator_node.h index 3071e20aa..4f9321024 100644 --- a/src/observer/sql/operator/operator_node.h +++ b/src/observer/sql/operator/operator_node.h @@ -145,4 +145,4 @@ class OperatorNode // cascade optimizer 中使用，为了logical/physical operator 可以统一在 cascade 中迭代 vector general_children_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/physical_operator.cpp b/src/observer/sql/operator/physical_operator.cpp index b9eebd17a..2406ba7c1 100644 --- a/src/observer/sql/operator/physical_operator.cpp +++ b/src/observer/sql/operator/physical_operator.cpp @@ -43,4 +43,4 @@ string physical_operator_type_name(PhysicalOperatorType type) string PhysicalOperator::name() const { return physical_operator_type_name(type()); } string PhysicalOperator::param() const { return ""; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/physical_operator.h b/src/observer/sql/operator/physical_operator.h index 21ea01441..16cbaf443 100644 --- a/src/observer/sql/operator/physical_operator.h +++ b/src/observer/sql/operator/physical_operator.h @@ -95,4 +95,4 @@ class PhysicalOperator : public OperatorNode protected: vector> children_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/predicate_logical_operator.cpp b/src/observer/sql/operator/predicate_logical_operator.cpp index bb0b94c55..ea427e1b9 100644 --- a/src/observer/sql/operator/predicate_logical_operator.cpp +++ b/src/observer/sql/operator/predicate_logical_operator.cpp @@ -20,4 +20,4 @@ PredicateLogicalOperator::PredicateLogicalOperator(unique_ptr expres { expressions_.emplace_back(std::move(expression)); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/predicate_logical_operator.h b/src/observer/sql/operator/predicate_logical_operator.h index 006e3cce0..05f5901a9 100644 --- a/src/observer/sql/operator/predicate_logical_operator.h +++ b/src/observer/sql/operator/predicate_logical_operator.h @@ -33,4 +33,4 @@ class PredicateLogicalOperator : public LogicalOperator OpType get_op_type() const override { return OpType::LOGICALFILTER; } }; -} +} // namespace oceanbase diff --git a/src/observer/sql/operator/predicate_physical_operator.cpp b/src/observer/sql/operator/predicate_physical_operator.cpp index 7fba74990..e911e2fae 100644 --- a/src/observer/sql/operator/predicate_physical_operator.cpp +++ b/src/observer/sql/operator/predicate_physical_operator.cpp @@ -69,8 +69,5 @@ RC PredicatePhysicalOperator::close() Tuple *PredicatePhysicalOperator::current_tuple() { return children_[0]->current_tuple(); } -RC PredicatePhysicalOperator::tuple_schema(TupleSchema &schema) const -{ - return children_[0]->tuple_schema(schema); -} -} \ No newline at end of file +RC PredicatePhysicalOperator::tuple_schema(TupleSchema &schema) const { return children_[0]->tuple_schema(schema); } +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/predicate_physical_operator.h b/src/observer/sql/operator/predicate_physical_operator.h index 5c717ee84..10ac20d36 100644 --- a/src/observer/sql/operator/predicate_physical_operator.h +++ b/src/observer/sql/operator/predicate_physical_operator.h @@ -46,4 +46,4 @@ class PredicatePhysicalOperator : public PhysicalOperator private: unique_ptr expression_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/project_logical_operator.cpp b/src/observer/sql/operator/project_logical_operator.cpp index 1127eeee7..3594e9e34 100644 --- a/src/observer/sql/operator/project_logical_operator.cpp +++ b/src/observer/sql/operator/project_logical_operator.cpp @@ -23,7 +23,7 @@ ProjectLogicalOperator::ProjectLogicalOperator(vector> && expressions_ = std::move(expressions); } -unique_ptr ProjectLogicalOperator::find_log_prop(const vector &log_props) +unique_ptr ProjectLogicalOperator::find_log_prop(const vector &log_props) { int card = 0; for (auto log_prop : log_props) { @@ -35,4 +35,4 @@ unique_ptr ProjectLogicalOperator::find_log_prop(const vector(card); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/project_logical_operator.h b/src/observer/sql/operator/project_logical_operator.h index 8bc9d695f..98369db38 100644 --- a/src/observer/sql/operator/project_logical_operator.h +++ b/src/observer/sql/operator/project_logical_operator.h @@ -38,4 +38,4 @@ class ProjectLogicalOperator : public LogicalOperator vector> &expressions() { return expressions_; } const vector> &expressions() const { return expressions_; } }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/project_physical_operator.cpp b/src/observer/sql/operator/project_physical_operator.cpp index 9c8b46787..265f7a50e 100644 --- a/src/observer/sql/operator/project_physical_operator.cpp +++ b/src/observer/sql/operator/project_physical_operator.cpp @@ -22,9 +22,8 @@ using namespace std; namespace oceanbase { ProjectPhysicalOperator::ProjectPhysicalOperator(vector> &&expressions) - : expressions_(std::move(expressions)), tuple_(expressions_) -{ -} + : expressions_(std::move(expressions)), tuple_(expressions_) +{} RC ProjectPhysicalOperator::open(Trx *trx) { @@ -70,4 +69,4 @@ RC ProjectPhysicalOperator::tuple_schema(TupleSchema &schema) const } return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/project_physical_operator.h b/src/observer/sql/operator/project_physical_operator.h index c587ff232..6e4d9e6cc 100644 --- a/src/observer/sql/operator/project_physical_operator.h +++ b/src/observer/sql/operator/project_physical_operator.h @@ -53,4 +53,4 @@ class ProjectPhysicalOperator : public PhysicalOperator vector> expressions_; ExpressionTuple> tuple_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/project_vec_physical_operator.cpp b/src/observer/sql/operator/project_vec_physical_operator.cpp index 40c7fea96..bfc5498d2 100644 --- a/src/observer/sql/operator/project_vec_physical_operator.cpp +++ b/src/observer/sql/operator/project_vec_physical_operator.cpp @@ -73,4 +73,4 @@ RC ProjectVecPhysicalOperator::tuple_schema(TupleSchema &schema) const } return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/project_vec_physical_operator.h b/src/observer/sql/operator/project_vec_physical_operator.h index 6b98dd7a4..acb95f5e5 100644 --- a/src/observer/sql/operator/project_vec_physical_operator.h +++ b/src/observer/sql/operator/project_vec_physical_operator.h @@ -41,4 +41,4 @@ class ProjectVecPhysicalOperator : public PhysicalOperator vector> expressions_; Chunk chunk_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/scalar_group_by_physical_operator.cpp b/src/observer/sql/operator/scalar_group_by_physical_operator.cpp index 511a8ed91..496f9df9c 100644 --- a/src/observer/sql/operator/scalar_group_by_physical_operator.cpp +++ b/src/observer/sql/operator/scalar_group_by_physical_operator.cpp @@ -67,7 +67,7 @@ RC ScalarGroupByPhysicalOperator::open(Trx *trx) composite_tuple.add_tuple(make_unique(std::move(child_tuple_to_value))); group_value_ = make_unique(std::move(aggregator_list), std::move(composite_tuple)); } - + rc = aggregate(get<0>(*group_value_), group_value_expression_tuple); if (OB_FAIL(rc)) { LOG_WARN("failed to aggregate values. rc=%s", strrc(rc)); @@ -120,4 +120,4 @@ Tuple *ScalarGroupByPhysicalOperator::current_tuple() return &get<1>(*group_value_); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/scalar_group_by_physical_operator.h b/src/observer/sql/operator/scalar_group_by_physical_operator.h index dbf27db97..9d1ddb459 100644 --- a/src/observer/sql/operator/scalar_group_by_physical_operator.h +++ b/src/observer/sql/operator/scalar_group_by_physical_operator.h @@ -41,4 +41,4 @@ class ScalarGroupByPhysicalOperator : public GroupByPhysicalOperator unique_ptr group_value_; bool emitted_ = false; /// 标识是否已经输出过 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/string_list_physical_operator.h b/src/observer/sql/operator/string_list_physical_operator.h index b47fcfbc3..e872f8546 100644 --- a/src/observer/sql/operator/string_list_physical_operator.h +++ b/src/observer/sql/operator/string_list_physical_operator.h @@ -91,4 +91,4 @@ class StringListPhysicalOperator : public PhysicalOperator bool started_ = false; ValueListTuple tuple_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/table_get_logical_operator.cpp b/src/observer/sql/operator/table_get_logical_operator.cpp index cfa96167d..eaa2d61ff 100644 --- a/src/observer/sql/operator/table_get_logical_operator.cpp +++ b/src/observer/sql/operator/table_get_logical_operator.cpp @@ -22,15 +22,12 @@ TableGetLogicalOperator::TableGetLogicalOperator(Table *table, ReadWriteMode mod : LogicalOperator(), table_(table), mode_(mode) {} -void TableGetLogicalOperator::set_predicates(vector> &&exprs) -{ - predicates_ = std::move(exprs); -} +void TableGetLogicalOperator::set_predicates(vector> &&exprs) { predicates_ = std::move(exprs); } -unique_ptr TableGetLogicalOperator::find_log_prop(const vector &log_props) +unique_ptr TableGetLogicalOperator::find_log_prop(const vector &log_props) { int card = Catalog::get_instance().get_table_stats(table_->table_id()).row_nums; // TODO: think about predicates. return make_unique(card); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/table_get_logical_operator.h b/src/observer/sql/operator/table_get_logical_operator.h index 95456ce2a..22808cf2e 100644 --- a/src/observer/sql/operator/table_get_logical_operator.h +++ b/src/observer/sql/operator/table_get_logical_operator.h @@ -69,4 +69,4 @@ class TableGetLogicalOperator : public LogicalOperator // 如果有多个表达式，他们的关系都是 AND vector> predicates_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/table_scan_physical_operator.cpp b/src/observer/sql/operator/table_scan_physical_operator.cpp index bb39da974..b720ea8b9 100644 --- a/src/observer/sql/operator/table_scan_physical_operator.cpp +++ b/src/observer/sql/operator/table_scan_physical_operator.cpp @@ -37,7 +37,7 @@ RC TableScanPhysicalOperator::next() bool filter_result = false; while (OB_SUCC(rc = record_scanner_->next(current_record_))) { LOG_TRACE("got a record. rid=%s", current_record_.rid().to_string().c_str()); - + tuple_.set_record(¤t_record_); rc = filter(tuple_, filter_result); if (rc != RC::SUCCESS) { @@ -55,7 +55,8 @@ RC TableScanPhysicalOperator::next() return rc; } -RC TableScanPhysicalOperator::close() { +RC TableScanPhysicalOperator::close() +{ RC rc = RC::SUCCESS; if (record_scanner_ != nullptr) { rc = record_scanner_->close_scan(); @@ -66,7 +67,6 @@ RC TableScanPhysicalOperator::close() { record_scanner_ = nullptr; } return rc; - } Tuple *TableScanPhysicalOperator::current_tuple() @@ -102,4 +102,4 @@ RC TableScanPhysicalOperator::filter(RowTuple &tuple, bool &result) result = true; return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/table_scan_physical_operator.h b/src/observer/sql/operator/table_scan_physical_operator.h index 4f881e33d..673206cb7 100644 --- a/src/observer/sql/operator/table_scan_physical_operator.h +++ b/src/observer/sql/operator/table_scan_physical_operator.h @@ -83,4 +83,4 @@ class TableScanPhysicalOperator : public PhysicalOperator RowTuple tuple_; vector> predicates_; // TODO chang predicate to table tuple filter }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/operator/table_scan_vec_physical_operator.cpp b/src/observer/sql/operator/table_scan_vec_physical_operator.cpp index ea1a16869..9ae9d5260 100644 --- a/src/observer/sql/operator/table_scan_vec_physical_operator.cpp +++ b/src/observer/sql/operator/table_scan_vec_physical_operator.cpp @@ -55,8 +55,7 @@ RC TableScanVecPhysicalOperator::next(Chunk &chunk) continue; } for (int j = 0; j < all_columns_.column_num(); j++) { - filterd_columns_.column(j).append_value( - all_columns_.column(filterd_columns_.column_ids(j)).get_value(i)); + filterd_columns_.column(j).append_value(all_columns_.column(filterd_columns_.column_ids(j)).get_value(i)); } } chunk.reference(filterd_columns_); @@ -85,4 +84,4 @@ RC TableScanVecPhysicalOperator::filter(Chunk &chunk) } return rc; } -} +} // namespace oceanbase diff --git a/src/observer/sql/operator/table_scan_vec_physical_operator.h b/src/observer/sql/operator/table_scan_vec_physical_operator.h index 5fc2c433d..28b21f88b 100644 --- a/src/observer/sql/operator/table_scan_vec_physical_operator.h +++ b/src/observer/sql/operator/table_scan_vec_physical_operator.h @@ -52,4 +52,4 @@ class TableScanVecPhysicalOperator : public PhysicalOperator vector select_; vector> predicates_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/cost_model.cpp b/src/observer/sql/optimizer/cascade/cost_model.cpp index 14f2beb39..48b296a22 100644 --- a/src/observer/sql/optimizer/cascade/cost_model.cpp +++ b/src/observer/sql/optimizer/cascade/cost_model.cpp @@ -15,19 +15,17 @@ See the Mulan PSL v2 for more details. */ namespace oceanbase { -double CostModel::calculate_cost(Memo *memo, - GroupExpr *gexpr) +double CostModel::calculate_cost(Memo *memo, GroupExpr *gexpr) { - auto op = gexpr->get_op(); - auto log_prop = memo->get_group_by_id(gexpr->get_group_id())->get_logical_prop(); - int arity = gexpr->get_children_groups_size(); - vector child_log_props; + auto op = gexpr->get_op(); + auto log_prop = memo->get_group_by_id(gexpr->get_group_id())->get_logical_prop(); + int arity = gexpr->get_children_groups_size(); + vector child_log_props; for (int i = 0; i < arity; ++i) { auto child_group_id = gexpr->get_child_group_id(i); - auto child_gexpr = memo->get_group_by_id(child_group_id); + auto child_gexpr = memo->get_group_by_id(child_group_id); child_log_props.push_back(child_gexpr->get_logical_prop()); } return op->calculate_cost(log_prop, child_log_props, this); - } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/cost_model.h b/src/observer/sql/optimizer/cascade/cost_model.h index fbb070c3d..397165ae1 100644 --- a/src/observer/sql/optimizer/cascade/cost_model.h +++ b/src/observer/sql/optimizer/cascade/cost_model.h @@ -29,7 +29,7 @@ class CostModel public: // TODO: support user-defined - CostModel(){}; + CostModel() {}; inline double cpu_op() { return CPU_OP; } @@ -47,4 +47,4 @@ class CostModel double calculate_cost(Memo *memo, GroupExpr *gexpr); }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/group.cpp b/src/observer/sql/optimizer/cascade/group.cpp index 4975097a6..2b9cfdbd6 100644 --- a/src/observer/sql/optimizer/cascade/group.cpp +++ b/src/observer/sql/optimizer/cascade/group.cpp @@ -14,24 +14,24 @@ See the Mulan PSL v2 for more details. */ namespace oceanbase { -Group::Group(int id, GroupExpr* expr, Memo *memo) - : id_(id), winner_(std::make_tuple(numeric_limits::max(), nullptr)), has_explored_(false) +Group::Group(int id, GroupExpr *expr, Memo *memo) + : id_(id), winner_(std::make_tuple(numeric_limits::max(), nullptr)), has_explored_(false) { - int arity = expr->get_children_groups_size(); - vector input_prop; - if(arity == 0) { + int arity = expr->get_children_groups_size(); + vector input_prop; + if (arity == 0) { + logical_prop_ = (expr->get_op())->find_log_prop(input_prop); + } else { + for (int i = 0; i < arity; i++) { + auto group = memo->get_group_by_id(expr->get_child_group_id(i)); + input_prop.push_back(group->get_logical_prop()); + } + logical_prop_ = (expr->get_op())->find_log_prop(input_prop); - } else { - for(int i=0; iget_group_by_id(expr->get_child_group_id(i)); - input_prop.push_back(group->get_logical_prop()); - } - - logical_prop_ = (expr->get_op())->find_log_prop(input_prop); } } -Group::~Group() { +Group::~Group() +{ for (auto expr : logical_expressions_) { delete expr; } @@ -50,8 +50,8 @@ void Group::add_expr(GroupExpr *expr) } } -bool Group::set_expr_cost(GroupExpr *expr, double cost) { - +bool Group::set_expr_cost(GroupExpr *expr, double cost) +{ if (std::get<0>(winner_) > cost) { // this is lower cost @@ -61,11 +61,10 @@ bool Group::set_expr_cost(GroupExpr *expr, double cost) { return false; } -GroupExpr *Group::get_winner() { - return std::get<1>(winner_); -} +GroupExpr *Group::get_winner() { return std::get<1>(winner_); } -GroupExpr *Group::get_logical_expression() { +GroupExpr *Group::get_logical_expression() +{ ASSERT(logical_expressions_.size() == 1, "There should exist only 1 logical expression"); ASSERT(physical_expressions_.empty(), "No physical expressions should be present"); return logical_expressions_[0]; @@ -76,4 +75,4 @@ void Group::dump() const LOG_TRACE("Group %d has %lu logical expressions and %lu physical expressions", id_, logical_expressions_.size(), physical_expressions_.size(), physical_expressions_.size()); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/group.h b/src/observer/sql/optimizer/cascade/group.h index 5f18b0c39..eb50572f9 100644 --- a/src/observer/sql/optimizer/cascade/group.h +++ b/src/observer/sql/optimizer/cascade/group.h @@ -113,4 +113,4 @@ class Group unique_ptr logical_prop_ = nullptr; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/group_expr.cpp b/src/observer/sql/optimizer/cascade/group_expr.cpp index 67cd2b892..96446ec6c 100644 --- a/src/observer/sql/optimizer/cascade/group_expr.cpp +++ b/src/observer/sql/optimizer/cascade/group_expr.cpp @@ -16,7 +16,8 @@ uint64_t GroupExpr::hash() const { auto hash = contents_->hash(); for (const auto &child : child_groups_) { - hash ^= std::hash()(child) + 0x9e3779b9 + (hash << 6) + (hash >> 2);; + hash ^= std::hash()(child) + 0x9e3779b9 + (hash << 6) + (hash >> 2); + ; } return hash; } @@ -29,4 +30,4 @@ void GroupExpr::dump() const } LOG_TRACE("GroupExpr contents: %d child groups: %s", static_cast(contents_->get_op_type()), ss.str().c_str()); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/group_expr.h b/src/observer/sql/optimizer/cascade/group_expr.h index 154700343..ea913710d 100644 --- a/src/observer/sql/optimizer/cascade/group_expr.h +++ b/src/observer/sql/optimizer/cascade/group_expr.h @@ -87,4 +87,4 @@ class GroupExpr double lowest_cost_ = std::numeric_limits::max(); }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/implementation_rules.cpp b/src/observer/sql/optimizer/cascade/implementation_rules.cpp index 864335cb9..470dcf6c1 100644 --- a/src/observer/sql/optimizer/cascade/implementation_rules.cpp +++ b/src/observer/sql/optimizer/cascade/implementation_rules.cpp @@ -33,24 +33,25 @@ namespace oceanbase { // ------------------------------------------------------------------------------------------------- // PhysicalSeqScan // ------------------------------------------------------------------------------------------------- -LogicalGetToPhysicalSeqScan::LogicalGetToPhysicalSeqScan() { - type_ = RuleType::GET_TO_SEQ_SCAN; +LogicalGetToPhysicalSeqScan::LogicalGetToPhysicalSeqScan() +{ + type_ = RuleType::GET_TO_SEQ_SCAN; match_pattern_ = unique_ptr(new Pattern(OpType::LOGICALGET)); } -void LogicalGetToPhysicalSeqScan::transform(OperatorNode* input, - std::vector> *transformed, - OptimizerContext *context) const { - TableGetLogicalOperator* table_get_oper = dynamic_cast(input); +void LogicalGetToPhysicalSeqScan::transform( + OperatorNode *input, std::vector> *transformed, OptimizerContext *context) const +{ + TableGetLogicalOperator *table_get_oper = dynamic_cast(input); vector> &log_preds = table_get_oper->predicates(); - vector> phys_preds; + vector> phys_preds; for (auto &pred : log_preds) { phys_preds.push_back(pred->copy()); } - Table *table = table_get_oper->table(); - auto table_scan_oper = new TableScanPhysicalOperator(table, table_get_oper->read_write_mode()); + Table *table = table_get_oper->table(); + auto table_scan_oper = new TableScanPhysicalOperator(table, table_get_oper->read_write_mode()); table_scan_oper->set_predicates(std::move(phys_preds)); auto oper = unique_ptr(table_scan_oper); @@ -60,18 +61,19 @@ void LogicalGetToPhysicalSeqScan::transform(OperatorNode* input, // ------------------------------------------------------------------------------------------------- // LogicalProjectionToProjection // ------------------------------------------------------------------------------------------------- -LogicalProjectionToProjection::LogicalProjectionToProjection() { - type_ = RuleType::PROJECTION_TO_PHYSOCAL; +LogicalProjectionToProjection::LogicalProjectionToProjection() +{ + type_ = RuleType::PROJECTION_TO_PHYSOCAL; match_pattern_ = unique_ptr(new Pattern(OpType::LOGICALPROJECTION)); - auto child = new Pattern(OpType::LEAF); + auto child = new Pattern(OpType::LEAF); match_pattern_->add_child(child); } -void LogicalProjectionToProjection::transform(OperatorNode* input, - std::vector> *transformed, - OptimizerContext *context) const { - auto project_oper = dynamic_cast(input); - vector> &child_opers = project_oper->children(); +void LogicalProjectionToProjection::transform( + OperatorNode *input, std::vector> *transformed, OptimizerContext *context) const +{ + auto project_oper = dynamic_cast(input); + vector> &child_opers = project_oper->children(); ASSERT(child_opers.size() == 1, "only one child is supported for now"); unique_ptr child_phy_oper; @@ -87,20 +89,20 @@ void LogicalProjectionToProjection::transform(OperatorNode* input, // ------------------------------------------------------------------------------------------------- // PhysicalInsert // ------------------------------------------------------------------------------------------------- -LogicalInsertToInsert::LogicalInsertToInsert() { - type_ = RuleType::INSERT_TO_PHYSICAL; +LogicalInsertToInsert::LogicalInsertToInsert() +{ + type_ = RuleType::INSERT_TO_PHYSICAL; match_pattern_ = unique_ptr(new Pattern(OpType::LOGICALINSERT)); } +void LogicalInsertToInsert::transform( + OperatorNode *input, std::vector> *transformed, OptimizerContext *context) const +{ + InsertLogicalOperator *insert_oper = dynamic_cast(input); -void LogicalInsertToInsert::transform(OperatorNode* input, - std::vector> *transformed, - OptimizerContext *context) const { - InsertLogicalOperator* insert_oper = dynamic_cast(input); - - Table *table = insert_oper->table(); - vector &values = insert_oper->values(); - auto insert_phy_oper = make_unique(table, std::move(values)); + Table *table = insert_oper->table(); + vector &values = insert_oper->values(); + auto insert_phy_oper = make_unique(table, std::move(values)); transformed->emplace_back(std::move(insert_phy_oper)); } @@ -110,17 +112,16 @@ void LogicalInsertToInsert::transform(OperatorNode* input, // ------------------------------------------------------------------------------------------------- LogicalExplainToExplain::LogicalExplainToExplain() { - type_ = RuleType::EXPLAIN_TO_PHYSICAL; + type_ = RuleType::EXPLAIN_TO_PHYSICAL; match_pattern_ = unique_ptr(new Pattern(OpType::LOGICALEXPLAIN)); - auto child = new Pattern(OpType::LEAF); + auto child = new Pattern(OpType::LEAF); match_pattern_->add_child(child); } -void LogicalExplainToExplain::transform(OperatorNode* input, - std::vector> *transformed, - OptimizerContext *context) const +void LogicalExplainToExplain::transform( + OperatorNode *input, std::vector> *transformed, OptimizerContext *context) const { - auto explain_oper = dynamic_cast(input); + auto explain_oper = dynamic_cast(input); unique_ptr explain_physical_oper(new ExplainPhysicalOperator()); for (auto &child : explain_oper->children()) { explain_physical_oper->add_general_child(child.get()); @@ -134,15 +135,14 @@ void LogicalExplainToExplain::transform(OperatorNode* input, // ------------------------------------------------------------------------------------------------- LogicalCalcToCalc::LogicalCalcToCalc() { - type_ = RuleType::CALC_TO_PHYSICAL; + type_ = RuleType::CALC_TO_PHYSICAL; match_pattern_ = unique_ptr(new Pattern(OpType::LOGICALCALCULATE)); } -void LogicalCalcToCalc::transform(OperatorNode* input, - std::vector> *transformed, - OptimizerContext *context) const +void LogicalCalcToCalc::transform( + OperatorNode *input, std::vector> *transformed, OptimizerContext *context) const { - auto calc_oper = dynamic_cast(input); + auto calc_oper = dynamic_cast(input); unique_ptr calc_phys_oper(new CalcPhysicalOperator(std::move(calc_oper->expressions()))); transformed->emplace_back(std::move(calc_phys_oper)); @@ -153,17 +153,16 @@ void LogicalCalcToCalc::transform(OperatorNode* input, // ------------------------------------------------------------------------------------------------- LogicalDeleteToDelete::LogicalDeleteToDelete() { - type_ = RuleType::DELETE_TO_PHYSICAL; + type_ = RuleType::DELETE_TO_PHYSICAL; match_pattern_ = unique_ptr(new Pattern(OpType::LOGICALDELETE)); - auto child = new Pattern(OpType::LEAF); + auto child = new Pattern(OpType::LEAF); match_pattern_->add_child(child); } -void LogicalDeleteToDelete::transform(OperatorNode* input, - std::vector> *transformed, - OptimizerContext *context) const +void LogicalDeleteToDelete::transform( + OperatorNode *input, std::vector> *transformed, OptimizerContext *context) const { - auto delete_oper = dynamic_cast(input); + auto delete_oper = dynamic_cast(input); auto delete_phys_oper = unique_ptr(new DeletePhysicalOperator(delete_oper->table())); for (auto &child : delete_oper->children()) { @@ -178,23 +177,23 @@ void LogicalDeleteToDelete::transform(OperatorNode* input, // ------------------------------------------------------------------------------------------------- LogicalPredicateToPredicate::LogicalPredicateToPredicate() { - type_ = RuleType::PREDICATE_TO_PHYSICAL; + type_ = RuleType::PREDICATE_TO_PHYSICAL; match_pattern_ = unique_ptr(new Pattern(OpType::LOGICALFILTER)); - auto child = new Pattern(OpType::LEAF); + auto child = new Pattern(OpType::LEAF); match_pattern_->add_child(child); } -void LogicalPredicateToPredicate::transform(OperatorNode* input, - std::vector> *transformed, - OptimizerContext *context) const +void LogicalPredicateToPredicate::transform( + OperatorNode *input, std::vector> *transformed, OptimizerContext *context) const { - auto predicate_oper = dynamic_cast(input); + auto predicate_oper = dynamic_cast(input); vector> &expressions = predicate_oper->expressions(); ASSERT(expressions.size() == 1, "predicate logical operator's children should be 1"); - unique_ptr expression = std::move(expressions.front()); - unique_ptr oper = unique_ptr(new PredicatePhysicalOperator(std::move(expression))); + unique_ptr expression = std::move(expressions.front()); + unique_ptr oper = + unique_ptr(new PredicatePhysicalOperator(std::move(expression))); for (auto &child : predicate_oper->children()) { oper->add_general_child(child.get()); } @@ -212,7 +211,6 @@ void LogicalPredicateToPredicate::transform(OperatorNode* input, // match_pattern_->add_child(child); // } - // void LogicalGroupByToAggregation::transform(OperatorNode* input, // std::vector> *transformed, // OptimizerContext *context) const @@ -232,7 +230,6 @@ void LogicalPredicateToPredicate::transform(OperatorNode* input, // transformed->emplace_back(std::move(groupby_phys_oper)); // } - // ------------------------------------------------------------------------------------------------- // Physical Hash Group By // ------------------------------------------------------------------------------------------------- @@ -244,7 +241,6 @@ void LogicalPredicateToPredicate::transform(OperatorNode* input, // match_pattern_->add_child(child); // } - // void LogicalGroupByToHashGroupBy::transform(OperatorNode* input, // std::vector> *transformed, // OptimizerContext *context) const @@ -264,4 +260,4 @@ void LogicalPredicateToPredicate::transform(OperatorNode* input, // transformed->emplace_back(std::move(groupby_phys_oper)); // } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/implementation_rules.h b/src/observer/sql/optimizer/cascade/implementation_rules.h index dec06f6de..daac7efda 100644 --- a/src/observer/sql/optimizer/cascade/implementation_rules.h +++ b/src/observer/sql/optimizer/cascade/implementation_rules.h @@ -128,4 +128,4 @@ class LogicalPredicateToPredicate : public Rule // std::vector> *transformed, // OptimizerContext *context) const override; // }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/memo.cpp b/src/observer/sql/optimizer/cascade/memo.cpp index c4e0a5a5e..0119ee974 100644 --- a/src/observer/sql/optimizer/cascade/memo.cpp +++ b/src/observer/sql/optimizer/cascade/memo.cpp @@ -53,4 +53,4 @@ void Memo::dump() const group->dump(); } } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/memo.h b/src/observer/sql/optimizer/cascade/memo.h index e12853102..0ddbf5af5 100644 --- a/src/observer/sql/optimizer/cascade/memo.h +++ b/src/observer/sql/optimizer/cascade/memo.h @@ -93,4 +93,4 @@ class Memo // shared_ptr 更加合适，但是改动比较大，先暂时不改了。 std::unordered_map> operator_nodes_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/optimizer.cpp b/src/observer/sql/optimizer/cascade/optimizer.cpp index 9e2a84f1f..b6c29857a 100644 --- a/src/observer/sql/optimizer/cascade/optimizer.cpp +++ b/src/observer/sql/optimizer/cascade/optimizer.cpp @@ -14,11 +14,11 @@ See the Mulan PSL v2 for more details. */ namespace oceanbase { -std::unique_ptr Optimizer::optimize(OperatorNode* op_tree) +std::unique_ptr Optimizer::optimize(OperatorNode *op_tree) { // Generate initial operator tree from query tree - GroupExpr *gexpr = nullptr; - bool insert = context_->record_node_into_group(op_tree, &gexpr); + GroupExpr *gexpr = nullptr; + bool insert = context_->record_node_into_group(op_tree, &gexpr); ASSERT(insert && gexpr, "Logical expression tree should insert"); context_->get_memo().dump(); @@ -32,7 +32,7 @@ std::unique_ptr Optimizer::optimize(OperatorNode* op_tree) std::unique_ptr Optimizer::choose_best_plan(int root_group_id) { - auto &memo = context_->get_memo(); + auto &memo = context_->get_memo(); Group *root_group = memo.get_group_by_id(root_group_id); ASSERT(root_group != nullptr, "Root group should not be null"); @@ -44,9 +44,9 @@ std::unique_ptr Optimizer::choose_best_plan(int root_group_id) } auto winner_contents = winner->get_op(); context_->get_memo().release_operator(winner_contents); - PhysicalOperator* winner_phys = dynamic_cast(winner_contents); + PhysicalOperator *winner_phys = dynamic_cast(winner_contents); LOG_TRACE("winner: %d", winner_phys->type()); - for (const auto& child : winner->get_child_group_ids()) { + for (const auto &child : winner->get_child_group_ids()) { winner_phys->add_child(choose_best_plan(child)); } @@ -72,4 +72,4 @@ void Optimizer::execute_task_stack(PendingTasks *task_stack, int root_group_id, delete task; } } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/optimizer.h b/src/observer/sql/optimizer/cascade/optimizer.h index 49981dad0..c6dd7cf54 100644 --- a/src/observer/sql/optimizer/cascade/optimizer.h +++ b/src/observer/sql/optimizer/cascade/optimizer.h @@ -38,4 +38,4 @@ class Optimizer CostModel cost_model_; std::unique_ptr context_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/optimizer_context.cpp b/src/observer/sql/optimizer/cascade/optimizer_context.cpp index e84c083f3..fbd0fa4b1 100644 --- a/src/observer/sql/optimizer/cascade/optimizer_context.cpp +++ b/src/observer/sql/optimizer/cascade/optimizer_context.cpp @@ -15,25 +15,30 @@ See the Mulan PSL v2 for more details. */ namespace oceanbase { OptimizerContext::OptimizerContext() - : memo_(new Memo()), rule_set_(new RuleSet()), cost_model_(), task_pool_(nullptr), - cost_upper_bound_(std::numeric_limits::max()) {} + : memo_(new Memo()), + rule_set_(new RuleSet()), + cost_model_(), + task_pool_(nullptr), + cost_upper_bound_(std::numeric_limits::max()) +{} -OptimizerContext::~OptimizerContext() { - if (task_pool_ != nullptr) { - delete task_pool_; - task_pool_ = nullptr; - } - if (memo_ != nullptr) { - delete memo_; - memo_ = nullptr; - } - if (rule_set_ != nullptr) { - delete rule_set_; - rule_set_ = nullptr; - } +OptimizerContext::~OptimizerContext() +{ + if (task_pool_ != nullptr) { + delete task_pool_; + task_pool_ = nullptr; } + if (memo_ != nullptr) { + delete memo_; + memo_ = nullptr; + } + if (rule_set_ != nullptr) { + delete rule_set_; + rule_set_ = nullptr; + } +} -GroupExpr *OptimizerContext::make_group_expression(OperatorNode* node) +GroupExpr *OptimizerContext::make_group_expression(OperatorNode *node) { std::vector child_groups; for (auto &child : node->get_general_children()) { @@ -52,22 +57,22 @@ GroupExpr *OptimizerContext::make_group_expression(OperatorNode* node) return new GroupExpr(node, std::move(child_groups)); } - bool OptimizerContext::record_node_into_group(OperatorNode* node, GroupExpr **gexpr, - int target_group) { - auto new_gexpr = make_group_expression(node); - auto ptr = memo_->insert_expression(new_gexpr, target_group); - ASSERT(ptr, "Root of expr should not fail insertion"); +bool OptimizerContext::record_node_into_group(OperatorNode *node, GroupExpr **gexpr, int target_group) +{ + auto new_gexpr = make_group_expression(node); + auto ptr = memo_->insert_expression(new_gexpr, target_group); + ASSERT(ptr, "Root of expr should not fail insertion"); - (*gexpr) = ptr; - return (ptr == new_gexpr); - } + (*gexpr) = ptr; + return (ptr == new_gexpr); +} - Memo &OptimizerContext::get_memo() { return *memo_; } +Memo &OptimizerContext::get_memo() { return *memo_; } - RuleSet &OptimizerContext::get_rule_set() { return *rule_set_; } +RuleSet &OptimizerContext::get_rule_set() { return *rule_set_; } - void OptimizerContext::record_operator_node_in_memo(unique_ptr&& node) - { - memo_->record_operator(std::move(node)); - } -} \ No newline at end of file +void OptimizerContext::record_operator_node_in_memo(unique_ptr &&node) +{ + memo_->record_operator(std::move(node)); +} +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/optimizer_context.h b/src/observer/sql/optimizer/cascade/optimizer_context.h index c33f59986..ae81af119 100644 --- a/src/observer/sql/optimizer/cascade/optimizer_context.h +++ b/src/observer/sql/optimizer/cascade/optimizer_context.h @@ -65,4 +65,4 @@ class OptimizerContext PendingTasks *task_pool_; double cost_upper_bound_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/pattern.h b/src/observer/sql/optimizer/cascade/pattern.h index 8d3126c49..414c2d5d4 100644 --- a/src/observer/sql/optimizer/cascade/pattern.h +++ b/src/observer/sql/optimizer/cascade/pattern.h @@ -35,4 +35,4 @@ class Pattern vector> children_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/pending_tasks.h b/src/observer/sql/optimizer/cascade/pending_tasks.h index b4ec336ca..8783a1dad 100644 --- a/src/observer/sql/optimizer/cascade/pending_tasks.h +++ b/src/observer/sql/optimizer/cascade/pending_tasks.h @@ -53,4 +53,4 @@ class PendingTasks */ std::stack task_stack_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/property.h b/src/observer/sql/optimizer/cascade/property.h index 41a6e4e05..692f78340 100644 --- a/src/observer/sql/optimizer/cascade/property.h +++ b/src/observer/sql/optimizer/cascade/property.h @@ -30,4 +30,4 @@ class LogicalProperty private: int card_ = 0; /// cardinality }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/property_set.h b/src/observer/sql/optimizer/cascade/property_set.h index 651a095e4..9e4479028 100644 --- a/src/observer/sql/optimizer/cascade/property_set.h +++ b/src/observer/sql/optimizer/cascade/property_set.h @@ -43,4 +43,4 @@ class PropertySet private: std::vector properties_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/rules.cpp b/src/observer/sql/optimizer/cascade/rules.cpp index 1b28ff51f..2b701465c 100644 --- a/src/observer/sql/optimizer/cascade/rules.cpp +++ b/src/observer/sql/optimizer/cascade/rules.cpp @@ -24,4 +24,4 @@ RuleSet::RuleSet() add_rule(RuleSetName::PHYSICAL_IMPLEMENTATION, new LogicalDeleteToDelete()); add_rule(RuleSetName::PHYSICAL_IMPLEMENTATION, new LogicalPredicateToPredicate()); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/rules.h b/src/observer/sql/optimizer/cascade/rules.h index 57cff90f0..26a0dc53d 100644 --- a/src/observer/sql/optimizer/cascade/rules.h +++ b/src/observer/sql/optimizer/cascade/rules.h @@ -196,4 +196,4 @@ class RuleSet */ std::unordered_map> rules_map_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.cpp b/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.cpp index c5dc6b4f7..61c4031f8 100644 --- a/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.cpp @@ -24,7 +24,7 @@ void ApplyRule::perform() return; } // TODO: expr binding, currently group_expr_->get_op() is enough - OperatorNode* before = group_expr_->get_op(); + OperatorNode *before = group_expr_->get_op(); // TODO: check condition @@ -32,7 +32,7 @@ void ApplyRule::perform() rule_->transform(before, &after, context_); for (const auto &new_expr : after) { GroupExpr *new_gexpr = nullptr; - auto g_id = group_expr_->get_group_id(); + auto g_id = group_expr_->get_group_id(); if (context_->record_node_into_group(new_expr.get(), &new_gexpr, g_id)) { if (new_gexpr->get_op()->is_logical()) { // further optimize new expr @@ -46,7 +46,7 @@ void ApplyRule::perform() new_gexpr->dump(); } } - + // TODO: FIXME, better way for record memory allocation for (size_t i = 0; i < after.size(); i++) { context_->record_operator_node_in_memo(std::move(after[i])); @@ -54,4 +54,4 @@ void ApplyRule::perform() group_expr_->set_rule_explored(rule_); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.h b/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.h index 6f91abe56..8f2fef4f2 100644 --- a/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/apply_rule_task.h @@ -31,4 +31,4 @@ class ApplyRule : public CascadeTask GroupExpr *group_expr_; Rule *rule_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/cascade_task.cpp b/src/observer/sql/optimizer/cascade/tasks/cascade_task.cpp index e32e5bd4a..ca4dfbfd5 100644 --- a/src/observer/sql/optimizer/cascade/tasks/cascade_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/cascade_task.cpp @@ -16,9 +16,9 @@ See the Mulan PSL v2 for more details. */ namespace oceanbase { -Memo &CascadeTask::get_memo() const {return context_->get_memo(); } +Memo &CascadeTask::get_memo() const { return context_->get_memo(); } RuleSet &CascadeTask::get_rule_set() const { return context_->get_rule_set(); } void CascadeTask::push_task(CascadeTask *task) { context_->push_task(task); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/cascade_task.h b/src/observer/sql/optimizer/cascade/tasks/cascade_task.h index aa4640a80..71845145c 100644 --- a/src/observer/sql/optimizer/cascade/tasks/cascade_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/cascade_task.h @@ -49,4 +49,4 @@ class CascadeTask CascadeTaskType type_; OptimizerContext *context_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/e_group_task.cpp b/src/observer/sql/optimizer/cascade/tasks/e_group_task.cpp index dcc1dc543..f10c08cb3 100644 --- a/src/observer/sql/optimizer/cascade/tasks/e_group_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/e_group_task.cpp @@ -27,4 +27,4 @@ void ExploreGroup::perform() group_->set_explored(); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/e_group_task.h b/src/observer/sql/optimizer/cascade/tasks/e_group_task.h index 594baae47..89eee3a1c 100644 --- a/src/observer/sql/optimizer/cascade/tasks/e_group_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/e_group_task.h @@ -30,4 +30,4 @@ class ExploreGroup : public CascadeTask private: Group *group_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/o_expr_task.cpp b/src/observer/sql/optimizer/cascade/tasks/o_expr_task.cpp index c7d0cbdb8..4445ef193 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_expr_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/o_expr_task.cpp @@ -61,4 +61,4 @@ void OptimizeExpression::perform() } } } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/o_expr_task.h b/src/observer/sql/optimizer/cascade/tasks/o_expr_task.h index c84f48f60..0ec6805a2 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_expr_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/o_expr_task.h @@ -29,4 +29,4 @@ class OptimizeExpression : public CascadeTask private: GroupExpr *group_expr_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/o_group_task.cpp b/src/observer/sql/optimizer/cascade/tasks/o_group_task.cpp index 3590d6d3c..61fb4f14b 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_group_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/o_group_task.cpp @@ -38,4 +38,4 @@ void OptimizeGroup::perform() group_->set_explored(); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/o_group_task.h b/src/observer/sql/optimizer/cascade/tasks/o_group_task.h index f183e678f..405a3e14b 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_group_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/o_group_task.h @@ -30,4 +30,4 @@ class OptimizeGroup : public CascadeTask private: Group *group_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/o_input_task.cpp b/src/observer/sql/optimizer/cascade/tasks/o_input_task.cpp index 9f8cb337d..c14b3dda9 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_input_task.cpp +++ b/src/observer/sql/optimizer/cascade/tasks/o_input_task.cpp @@ -25,19 +25,18 @@ void OptimizeInputs::perform() cur_child_idx_ = 0; // only calculate once for current group expr - cur_total_cost_ += context_->get_cost_model()->calculate_cost( - &context_->get_memo(), group_expr_); + cur_total_cost_ += context_->get_cost_model()->calculate_cost(&context_->get_memo(), group_expr_); } for (; cur_child_idx_ < static_cast(group_expr_->get_children_groups_size()); cur_child_idx_++) { - auto child_group = - context_->get_memo().get_group_by_id(group_expr_->get_child_group_id(cur_child_idx_)); + auto child_group = context_->get_memo().get_group_by_id(group_expr_->get_child_group_id(cur_child_idx_)); // check whether the child group is already optimized auto child_best_expr = child_group->get_winner(); if (child_best_expr != nullptr) { cur_total_cost_ += child_best_expr->get_cost(); LOG_INFO("cur_total_cost_ = %f", cur_total_cost_); - if (cur_total_cost_ > context_->get_cost_upper_bound()) break; + if (cur_total_cost_ > context_->get_cost_upper_bound()) + break; } else if (prev_child_idx_ != cur_child_idx_) { // we haven't optimized child group prev_child_idx_ = cur_child_idx_; push_task(new OptimizeInputs(this)); @@ -46,11 +45,11 @@ void OptimizeInputs::perform() } } - if (cur_child_idx_ == static_cast(group_expr_->get_children_groups_size())) { - group_expr_->set_local_cost(cur_total_cost_); + if (cur_child_idx_ == static_cast(group_expr_->get_children_groups_size())) { + group_expr_->set_local_cost(cur_total_cost_); - auto cur_group = get_memo().get_group_by_id(group_expr_->get_group_id()); - cur_group->set_expr_cost(group_expr_, cur_total_cost_); - } + auto cur_group = get_memo().get_group_by_id(group_expr_->get_group_id()); + cur_group->set_expr_cost(group_expr_, cur_total_cost_); + } } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/tasks/o_input_task.h b/src/observer/sql/optimizer/cascade/tasks/o_input_task.h index 8637d127e..a67ba0b1c 100644 --- a/src/observer/sql/optimizer/cascade/tasks/o_input_task.h +++ b/src/observer/sql/optimizer/cascade/tasks/o_input_task.h @@ -51,4 +51,4 @@ class OptimizeInputs : public CascadeTask */ int prev_child_idx_ = -1; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/comparison_simplification_rule.cpp b/src/observer/sql/optimizer/comparison_simplification_rule.cpp index 9aaa7e23b..9c0977a9f 100644 --- a/src/observer/sql/optimizer/comparison_simplification_rule.cpp +++ b/src/observer/sql/optimizer/comparison_simplification_rule.cpp @@ -38,4 +38,4 @@ RC ComparisonSimplificationRule::rewrite(unique_ptr &expr, bool &cha } return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/comparison_simplification_rule.h b/src/observer/sql/optimizer/comparison_simplification_rule.h index 5f2405a51..85f4ca1f5 100644 --- a/src/observer/sql/optimizer/comparison_simplification_rule.h +++ b/src/observer/sql/optimizer/comparison_simplification_rule.h @@ -37,4 +37,4 @@ class ComparisonSimplificationRule : public ExpressionRewriteRule private: }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/conjunction_simplification_rule.cpp b/src/observer/sql/optimizer/conjunction_simplification_rule.cpp index ce3357a94..450eaf5eb 100644 --- a/src/observer/sql/optimizer/conjunction_simplification_rule.cpp +++ b/src/observer/sql/optimizer/conjunction_simplification_rule.cpp @@ -34,17 +34,17 @@ RC ConjunctionSimplificationRule::rewrite(unique_ptr &expr, bool &ch return rc; } - change_made = false; - auto conjunction_expr = static_cast(expr.get()); + change_made = false; + auto conjunction_expr = static_cast(expr.get()); - vector> &child_exprs = conjunction_expr->children(); + vector> &child_exprs = conjunction_expr->children(); // 先看看有没有能够直接去掉的表达式。比如AND时恒为true的表达式可以删除 // 或者是否可以直接计算出当前表达式的值。比如AND时，如果有一个表达式为false，那么整个表达式就是false for (auto iter = child_exprs.begin(); iter != child_exprs.end();) { bool constant_value = false; - rc = try_to_get_bool_constant(*iter, constant_value); + rc = try_to_get_bool_constant(*iter, constant_value); if (rc != RC::SUCCESS) { rc = RC::SUCCESS; ++iter; @@ -85,4 +85,4 @@ RC ConjunctionSimplificationRule::rewrite(unique_ptr &expr, bool &ch return rc; } -} +} // namespace oceanbase diff --git a/src/observer/sql/optimizer/conjunction_simplification_rule.h b/src/observer/sql/optimizer/conjunction_simplification_rule.h index c68a0cfa9..104a82246 100644 --- a/src/observer/sql/optimizer/conjunction_simplification_rule.h +++ b/src/observer/sql/optimizer/conjunction_simplification_rule.h @@ -35,4 +35,4 @@ class ConjunctionSimplificationRule : public ExpressionRewriteRule private: }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/expression_rewriter.cpp b/src/observer/sql/optimizer/expression_rewriter.cpp index 59f201891..3b3cd2d66 100644 --- a/src/observer/sql/optimizer/expression_rewriter.cpp +++ b/src/observer/sql/optimizer/expression_rewriter.cpp @@ -71,7 +71,7 @@ RC ExpressionRewriter::rewrite_expression(unique_ptr &expr, bool &ch for (unique_ptr &rule : expr_rewrite_rules_) { bool sub_change_made = false; - rc = rule->rewrite(expr, sub_change_made); + rc = rule->rewrite(expr, sub_change_made); if (sub_change_made && !change_made) { change_made = true; } @@ -93,25 +93,25 @@ RC ExpressionRewriter::rewrite_expression(unique_ptr &expr, bool &ch case ExprType::CAST: { unique_ptr &child_expr = (static_cast(expr.get()))->child(); - rc = rewrite_expression(child_expr, change_made); + rc = rewrite_expression(child_expr, change_made); } break; case ExprType::COMPARISON: { - auto comparison_expr = static_cast(expr.get()); + auto comparison_expr = static_cast(expr.get()); - unique_ptr &left_expr = comparison_expr->left(); - unique_ptr &right_expr = comparison_expr->right(); + unique_ptr &left_expr = comparison_expr->left(); + unique_ptr &right_expr = comparison_expr->right(); bool left_change_made = false; - rc = rewrite_expression(left_expr, left_change_made); + rc = rewrite_expression(left_expr, left_change_made); if (rc != RC::SUCCESS) { return rc; } bool right_change_made = false; - rc = rewrite_expression(right_expr, right_change_made); + rc = rewrite_expression(right_expr, right_change_made); if (rc != RC::SUCCESS) { return rc; } @@ -122,13 +122,13 @@ RC ExpressionRewriter::rewrite_expression(unique_ptr &expr, bool &ch } break; case ExprType::CONJUNCTION: { - auto conjunction_expr = static_cast(expr.get()); + auto conjunction_expr = static_cast(expr.get()); - vector> &children = conjunction_expr->children(); + vector> &children = conjunction_expr->children(); for (unique_ptr &child_expr : children) { bool sub_change_made = false; - rc = rewrite_expression(child_expr, sub_change_made); + rc = rewrite_expression(child_expr, sub_change_made); if (rc != RC::SUCCESS) { LOG_WARN("failed to rewriter conjunction sub expression. rc=%s", strrc(rc)); @@ -147,4 +147,4 @@ RC ExpressionRewriter::rewrite_expression(unique_ptr &expr, bool &ch } return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/expression_rewriter.h b/src/observer/sql/optimizer/expression_rewriter.h index c60a8a723..a59c0be60 100644 --- a/src/observer/sql/optimizer/expression_rewriter.h +++ b/src/observer/sql/optimizer/expression_rewriter.h @@ -36,4 +36,4 @@ class ExpressionRewriter : public RewriteRule private: vector> expr_rewrite_rules_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/logical_plan_generator.cpp b/src/observer/sql/optimizer/logical_plan_generator.cpp index fe32c20e6..40fe3a0c6 100644 --- a/src/observer/sql/optimizer/logical_plan_generator.cpp +++ b/src/observer/sql/optimizer/logical_plan_generator.cpp @@ -116,7 +116,6 @@ RC LogicalPlanGenerator::create_plan(SelectStmt *select_stmt, unique_ptradd_child(std::move(*last_oper)); @@ -140,7 +139,8 @@ RC LogicalPlanGenerator::create_plan(SelectStmt *select_stmt, unique_ptr project_oper = make_unique(std::move(select_stmt->query_expressions())); + unique_ptr project_oper = + make_unique(std::move(select_stmt->query_expressions())); if (*last_oper) { project_oper->add_child(std::move(*last_oper)); } @@ -153,7 +153,7 @@ RC LogicalPlanGenerator::create_plan(SelectStmt *select_stmt, unique_ptr &logical_operator) { - RC rc = RC::SUCCESS; + RC rc = RC::SUCCESS; vector> cmp_exprs; const vector &filter_units = filter_stmt->filter_units(); for (const FilterUnit *filter_unit : filter_units) { @@ -173,11 +173,10 @@ RC LogicalPlanGenerator::create_plan(FilterStmt *filter_stmt, unique_ptrvalue_type(), left->value_type()); if (left_to_right_cost <= right_to_left_cost && left_to_right_cost != INT32_MAX) { ExprType left_type = left->type(); - auto cast_expr = make_unique(std::move(left), right->value_type()); + auto cast_expr = make_unique(std::move(left), right->value_type()); if (left_type == ExprType::VALUE) { Value left_val; - if (OB_FAIL(rc = cast_expr->try_get_value(left_val))) - { + if (OB_FAIL(rc = cast_expr->try_get_value(left_val))) { LOG_WARN("failed to get value from left child", strrc(rc)); return rc; } @@ -187,11 +186,10 @@ RC LogicalPlanGenerator::create_plan(FilterStmt *filter_stmt, unique_ptrtype(); - auto cast_expr = make_unique(std::move(right), left->value_type()); + auto cast_expr = make_unique(std::move(right), left->value_type()); if (right_type == ExprType::VALUE) { Value right_val; - if (OB_FAIL(rc = cast_expr->try_get_value(right_val))) - { + if (OB_FAIL(rc = cast_expr->try_get_value(right_val))) { LOG_WARN("failed to get value from right child", strrc(rc)); return rc; } @@ -284,10 +282,10 @@ RC LogicalPlanGenerator::create_plan(ExplainStmt *explain_stmt, unique_ptr &logical_operator) { - vector> &group_by_expressions = select_stmt->group_by(); - vector aggregate_expressions; - vector> &query_expressions = select_stmt->query_expressions(); - function&)> collector = [&](unique_ptr &expr) -> RC { + vector> &group_by_expressions = select_stmt->group_by(); + vector aggregate_expressions; + vector> &query_expressions = select_stmt->query_expressions(); + function &)> collector = [&](unique_ptr &expr) -> RC { RC rc = RC::SUCCESS; if (expr->type() == ExprType::AGGREGATION) { expr->set_pos(aggregate_expressions.size() + group_by_expressions.size()); @@ -297,7 +295,7 @@ RC LogicalPlanGenerator::create_group_by_plan(SelectStmt *select_stmt, unique_pt return rc; }; - function&)> bind_group_by_expr = [&](unique_ptr &expr) -> RC { + function &)> bind_group_by_expr = [&](unique_ptr &expr) -> RC { RC rc = RC::SUCCESS; for (size_t i = 0; i < group_by_expressions.size(); i++) { auto &group_by = group_by_expressions[i]; @@ -313,8 +311,8 @@ RC LogicalPlanGenerator::create_group_by_plan(SelectStmt *select_stmt, unique_pt return rc; }; - bool found_unbound_column = false; - function&)> find_unbound_column = [&](unique_ptr &expr) -> RC { + bool found_unbound_column = false; + function &)> find_unbound_column = [&](unique_ptr &expr) -> RC { RC rc = RC::SUCCESS; if (expr->type() == ExprType::AGGREGATION) { // do nothing @@ -322,12 +320,11 @@ RC LogicalPlanGenerator::create_group_by_plan(SelectStmt *select_stmt, unique_pt // do nothing } else if (expr->type() == ExprType::FIELD) { found_unbound_column = true; - }else { + } else { rc = ExpressionIterator::iterate_child_expr(*expr, find_unbound_column); } return rc; }; - for (unique_ptr &expression : query_expressions) { bind_group_by_expr(expression); @@ -354,9 +351,9 @@ RC LogicalPlanGenerator::create_group_by_plan(SelectStmt *select_stmt, unique_pt // 如果只需要聚合，但是没有group by 语句，需要生成一个空的group by 语句 - auto group_by_oper = make_unique(std::move(group_by_expressions), - std::move(aggregate_expressions)); + auto group_by_oper = + make_unique(std::move(group_by_expressions), std::move(aggregate_expressions)); logical_operator = std::move(group_by_oper); return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/logical_plan_generator.h b/src/observer/sql/optimizer/logical_plan_generator.h index 8684267e1..20746ba1b 100644 --- a/src/observer/sql/optimizer/logical_plan_generator.h +++ b/src/observer/sql/optimizer/logical_plan_generator.h @@ -49,4 +49,4 @@ class LogicalPlanGenerator int implicit_cast_cost(AttrType from, AttrType to); }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/optimize_stage.cpp b/src/observer/sql/optimizer/optimize_stage.cpp index 2b773d7aa..bd6207827 100644 --- a/src/observer/sql/optimizer/optimize_stage.cpp +++ b/src/observer/sql/optimizer/optimize_stage.cpp @@ -91,10 +91,11 @@ RC OptimizeStage::generate_physical_plan( unique_ptr &logical_operator, unique_ptr &physical_operator, Session *session) { RC rc = RC::SUCCESS; - if (session->get_execution_mode() == ExecutionMode::CHUNK_ITERATOR && LogicalOperator::can_generate_vectorized_operator(logical_operator->type())) { + if (session->get_execution_mode() == ExecutionMode::CHUNK_ITERATOR && + LogicalOperator::can_generate_vectorized_operator(logical_operator->type())) { LOG_TRACE("use chunk iterator"); session->set_used_chunk_mode(true); - rc = physical_plan_generator_.create_vec(*logical_operator, physical_operator, session); + rc = physical_plan_generator_.create_vec(*logical_operator, physical_operator, session); } else { LOG_TRACE("use tuple iterator"); session->set_used_chunk_mode(false); @@ -132,4 +133,4 @@ RC OptimizeStage::create_logical_plan(SQLStageEvent *sql_event, unique_ptr& children) +string OptimizerUtils::dump_physical_plan(const unique_ptr &children) { - std::function &)> to_string = [&]( - ostream &os, PhysicalOperator *oper, int level, bool last_child, vector &ends) - { - for (int i = 0; i < level - 1; i++) { - if (ends[i]) { - os << " "; - } else { - os << "│ "; - } - } - if (level > 0) { - if (last_child) { - os << "└─"; - ends[level - 1] = 1; - } else { - os << "├─"; - } - } + std::function &)> to_string = + [&](ostream &os, PhysicalOperator *oper, int level, bool last_child, vector &ends) { + for (int i = 0; i < level - 1; i++) { + if (ends[i]) { + os << " "; + } else { + os << "│ "; + } + } + if (level > 0) { + if (last_child) { + os << "└─"; + ends[level - 1] = 1; + } else { + os << "├─"; + } + } - os << oper->name(); - string param = oper->param(); - if (!param.empty()) { - os << "(" << param << ")"; - } - os << '\n'; + os << oper->name(); + string param = oper->param(); + if (!param.empty()) { + os << "(" << param << ")"; + } + os << '\n'; - if (static_cast(ends.size()) < level + 2) { - ends.resize(level + 2); - } - ends[level + 1] = 0; + if (static_cast(ends.size()) < level + 2) { + ends.resize(level + 2); + } + ends[level + 1] = 0; - vector> &children = oper->children(); - const auto size = static_cast(children.size()); - for (auto i = 0; i < size - 1; i++) { - to_string(os, children[i].get(), level + 1, false /*last_child*/, ends); - } - if (size > 0) { - to_string(os, children[size - 1].get(), level + 1, true /*last_child*/, ends); - } - }; + vector> &children = oper->children(); + const auto size = static_cast(children.size()); + for (auto i = 0; i < size - 1; i++) { + to_string(os, children[i].get(), level + 1, false /*last_child*/, ends); + } + if (size > 0) { + to_string(os, children[size - 1].get(), level + 1, true /*last_child*/, ends); + } + }; stringstream ss; ss << "OPERATOR(NAME)\n"; - int level = 0; + int level = 0; vector ends; ends.push_back(true); to_string(ss, children.get(), level, true /*last_child*/, ends); return ss.str(); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/optimizer_utils.h b/src/observer/sql/optimizer/optimizer_utils.h index 140b32cfc..502253c93 100644 --- a/src/observer/sql/optimizer/optimizer_utils.h +++ b/src/observer/sql/optimizer/optimizer_utils.h @@ -21,4 +21,4 @@ class OptimizerUtils public: static string dump_physical_plan(const unique_ptr &root); }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/physical_plan_generator.cpp b/src/observer/sql/optimizer/physical_plan_generator.cpp index 2519c23ca..994e1b59a 100644 --- a/src/observer/sql/optimizer/physical_plan_generator.cpp +++ b/src/observer/sql/optimizer/physical_plan_generator.cpp @@ -48,7 +48,8 @@ using namespace std; namespace oceanbase { -RC PhysicalPlanGenerator::create(LogicalOperator &logical_operator, unique_ptr &oper, Session* session) +RC PhysicalPlanGenerator::create( + LogicalOperator &logical_operator, unique_ptr &oper, Session *session) { RC rc = RC::SUCCESS; @@ -97,7 +98,8 @@ RC PhysicalPlanGenerator::create(LogicalOperator &logical_operator, unique_ptr

&oper, Session* session) +RC PhysicalPlanGenerator::create_vec( + LogicalOperator &logical_operator, unique_ptr &oper, Session *session) { RC rc = RC::SUCCESS; @@ -122,7 +124,8 @@ RC PhysicalPlanGenerator::create_vec(LogicalOperator &logical_operator, unique_p return rc; } -RC PhysicalPlanGenerator::create_plan(TableGetLogicalOperator &table_get_oper, unique_ptr &oper, Session* session) +RC PhysicalPlanGenerator::create_plan( + TableGetLogicalOperator &table_get_oper, unique_ptr &oper, Session *session) { vector> &predicates = table_get_oper.predicates(); // 看看是否有可以用于索引查找的表达式 @@ -193,7 +196,8 @@ RC PhysicalPlanGenerator::create_plan(TableGetLogicalOperator &table_get_oper, u return RC::SUCCESS; } -RC PhysicalPlanGenerator::create_plan(PredicateLogicalOperator &pred_oper, unique_ptr &oper, Session* session) +RC PhysicalPlanGenerator::create_plan( + PredicateLogicalOperator &pred_oper, unique_ptr &oper, Session *session) { vector> &children_opers = pred_oper.children(); ASSERT(children_opers.size() == 1, "predicate logical operator's sub oper number should be 1"); @@ -216,7 +220,8 @@ RC PhysicalPlanGenerator::create_plan(PredicateLogicalOperator &pred_oper, uniqu return rc; } -RC PhysicalPlanGenerator::create_plan(ProjectLogicalOperator &project_oper, unique_ptr &oper, Session* session) +RC PhysicalPlanGenerator::create_plan( + ProjectLogicalOperator &project_oper, unique_ptr &oper, Session *session) { vector> &child_opers = project_oper.children(); @@ -244,7 +249,8 @@ RC PhysicalPlanGenerator::create_plan(ProjectLogicalOperator &project_oper, uniq return rc; } -RC PhysicalPlanGenerator::create_plan(InsertLogicalOperator &insert_oper, unique_ptr &oper, Session* session) +RC PhysicalPlanGenerator::create_plan( + InsertLogicalOperator &insert_oper, unique_ptr &oper, Session *session) { Table *table = insert_oper.table(); vector &values = insert_oper.values(); @@ -253,7 +259,8 @@ RC PhysicalPlanGenerator::create_plan(InsertLogicalOperator &insert_oper, unique return RC::SUCCESS; } -RC PhysicalPlanGenerator::create_plan(DeleteLogicalOperator &delete_oper, unique_ptr &oper, Session* session) +RC PhysicalPlanGenerator::create_plan( + DeleteLogicalOperator &delete_oper, unique_ptr &oper, Session *session) { vector> &child_opers = delete_oper.children(); @@ -278,7 +285,8 @@ RC PhysicalPlanGenerator::create_plan(DeleteLogicalOperator &delete_oper, unique return rc; } -RC PhysicalPlanGenerator::create_plan(ExplainLogicalOperator &explain_oper, unique_ptr &oper, Session* session) +RC PhysicalPlanGenerator::create_plan( + ExplainLogicalOperator &explain_oper, unique_ptr &oper, Session *session) { vector> &child_opers = explain_oper.children(); @@ -300,7 +308,8 @@ RC PhysicalPlanGenerator::create_plan(ExplainLogicalOperator &explain_oper, uniq return rc; } -RC PhysicalPlanGenerator::create_plan(JoinLogicalOperator &join_oper, unique_ptr &oper, Session* session) +RC PhysicalPlanGenerator::create_plan( + JoinLogicalOperator &join_oper, unique_ptr &oper, Session *session) { RC rc = RC::SUCCESS; @@ -335,7 +344,8 @@ bool PhysicalPlanGenerator::can_use_hash_join(JoinLogicalOperator &join_oper) return false; } -RC PhysicalPlanGenerator::create_plan(CalcLogicalOperator &logical_oper, unique_ptr &oper, Session* session) +RC PhysicalPlanGenerator::create_plan( + CalcLogicalOperator &logical_oper, unique_ptr &oper, Session *session) { RC rc = RC::SUCCESS; @@ -344,17 +354,18 @@ RC PhysicalPlanGenerator::create_plan(CalcLogicalOperator &logical_oper, unique_ return rc; } -RC PhysicalPlanGenerator::create_plan(GroupByLogicalOperator &logical_oper, unique_ptr &oper, Session* session) +RC PhysicalPlanGenerator::create_plan( + GroupByLogicalOperator &logical_oper, unique_ptr &oper, Session *session) { RC rc = RC::SUCCESS; - vector> &group_by_expressions = logical_oper.group_by_expressions(); + vector> &group_by_expressions = logical_oper.group_by_expressions(); unique_ptr group_by_oper; if (group_by_expressions.empty()) { group_by_oper = make_unique(std::move(logical_oper.aggregate_expressions())); } else { - group_by_oper = make_unique(std::move(logical_oper.group_by_expressions()), - std::move(logical_oper.aggregate_expressions())); + group_by_oper = make_unique( + std::move(logical_oper.group_by_expressions()), std::move(logical_oper.aggregate_expressions())); } ASSERT(logical_oper.children().size() == 1, "group by operator should have 1 child"); @@ -373,11 +384,13 @@ RC PhysicalPlanGenerator::create_plan(GroupByLogicalOperator &logical_oper, uniq return rc; } -RC PhysicalPlanGenerator::create_vec_plan(TableGetLogicalOperator &table_get_oper, unique_ptr &oper, Session* session) +RC PhysicalPlanGenerator::create_vec_plan( + TableGetLogicalOperator &table_get_oper, unique_ptr &oper, Session *session) { vector> &predicates = table_get_oper.predicates(); - Table *table = table_get_oper.table(); - TableScanVecPhysicalOperator *table_scan_oper = new TableScanVecPhysicalOperator(table, table_get_oper.read_write_mode()); + Table *table = table_get_oper.table(); + TableScanVecPhysicalOperator *table_scan_oper = + new TableScanVecPhysicalOperator(table, table_get_oper.read_write_mode()); table_scan_oper->set_predicates(std::move(predicates)); oper = unique_ptr(table_scan_oper); LOG_TRACE("use vectorized table scan"); @@ -385,16 +398,16 @@ RC PhysicalPlanGenerator::create_vec_plan(TableGetLogicalOperator &table_get_ope return RC::SUCCESS; } -RC PhysicalPlanGenerator::create_vec_plan(GroupByLogicalOperator &logical_oper, unique_ptr &oper, Session* session) +RC PhysicalPlanGenerator::create_vec_plan( + GroupByLogicalOperator &logical_oper, unique_ptr &oper, Session *session) { - RC rc = RC::SUCCESS; + RC rc = RC::SUCCESS; unique_ptr physical_oper = nullptr; if (logical_oper.group_by_expressions().empty()) { physical_oper = make_unique(std::move(logical_oper.aggregate_expressions())); } else { physical_oper = make_unique( - std::move(logical_oper.group_by_expressions()), std::move(logical_oper.aggregate_expressions())); - + std::move(logical_oper.group_by_expressions()), std::move(logical_oper.aggregate_expressions())); } ASSERT(logical_oper.children().size() == 1, "group by operator should have 1 child"); @@ -415,7 +428,8 @@ RC PhysicalPlanGenerator::create_vec_plan(GroupByLogicalOperator &logical_oper, return RC::SUCCESS; } -RC PhysicalPlanGenerator::create_vec_plan(ProjectLogicalOperator &project_oper, unique_ptr &oper, Session* session) +RC PhysicalPlanGenerator::create_vec_plan( + ProjectLogicalOperator &project_oper, unique_ptr &oper, Session *session) { vector> &child_opers = project_oper.children(); @@ -449,8 +463,8 @@ RC PhysicalPlanGenerator::create_vec_plan(ProjectLogicalOperator &project_oper, return rc; } - -RC PhysicalPlanGenerator::create_vec_plan(ExplainLogicalOperator &explain_oper, unique_ptr &oper, Session* session) +RC PhysicalPlanGenerator::create_vec_plan( + ExplainLogicalOperator &explain_oper, unique_ptr &oper, Session *session) { vector> &child_opers = explain_oper.children(); @@ -471,4 +485,4 @@ RC PhysicalPlanGenerator::create_vec_plan(ExplainLogicalOperator &explain_oper, oper = std::move(explain_physical_oper); return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/physical_plan_generator.h b/src/observer/sql/optimizer/physical_plan_generator.h index d3c3f675e..eae58dad6 100644 --- a/src/observer/sql/optimizer/physical_plan_generator.h +++ b/src/observer/sql/optimizer/physical_plan_generator.h @@ -64,4 +64,4 @@ class PhysicalPlanGenerator // TODO: remove this and add CBO rules bool can_use_hash_join(JoinLogicalOperator &logical_oper); }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/predicate_pushdown_rewriter.cpp b/src/observer/sql/optimizer/predicate_pushdown_rewriter.cpp index b648cb7ad..592fc3791 100644 --- a/src/observer/sql/optimizer/predicate_pushdown_rewriter.cpp +++ b/src/observer/sql/optimizer/predicate_pushdown_rewriter.cpp @@ -43,7 +43,7 @@ RC PredicatePushdownRewriter::rewrite(unique_ptr &oper, bool &c return rc; } - unique_ptr &predicate_expr = predicate_oper_exprs.front(); + unique_ptr &predicate_expr = predicate_oper_exprs.front(); vector> pushdown_exprs; rc = get_exprs_can_pushdown(predicate_expr, pushdown_exprs); if (rc != RC::SUCCESS) { @@ -126,4 +126,4 @@ RC PredicatePushdownRewriter::get_exprs_can_pushdown( } return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/predicate_pushdown_rewriter.h b/src/observer/sql/optimizer/predicate_pushdown_rewriter.h index b844853d6..ccf8f1e1e 100644 --- a/src/observer/sql/optimizer/predicate_pushdown_rewriter.h +++ b/src/observer/sql/optimizer/predicate_pushdown_rewriter.h @@ -36,4 +36,4 @@ class PredicatePushdownRewriter : public RewriteRule RC get_exprs_can_pushdown(unique_ptr &expr, vector> &pushdown_exprs); bool is_empty_predicate(unique_ptr &expr); }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/predicate_rewrite.cpp b/src/observer/sql/optimizer/predicate_rewrite.cpp index 68c0b8a00..a0c0a1e73 100644 --- a/src/observer/sql/optimizer/predicate_rewrite.cpp +++ b/src/observer/sql/optimizer/predicate_rewrite.cpp @@ -58,4 +58,4 @@ RC PredicateRewriteRule::rewrite(unique_ptr &oper, bool &change change_made = true; return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/predicate_rewrite.h b/src/observer/sql/optimizer/predicate_rewrite.h index 3a851df49..1c16ff32f 100644 --- a/src/observer/sql/optimizer/predicate_rewrite.h +++ b/src/observer/sql/optimizer/predicate_rewrite.h @@ -31,4 +31,4 @@ class PredicateRewriteRule : public RewriteRule RC rewrite(unique_ptr &oper, bool &change_made) override; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/predicate_to_join_rule.h b/src/observer/sql/optimizer/predicate_to_join_rule.h index 243d492b8..5ad6ea1dd 100644 --- a/src/observer/sql/optimizer/predicate_to_join_rule.h +++ b/src/observer/sql/optimizer/predicate_to_join_rule.h @@ -21,4 +21,4 @@ namespace oceanbase { */ class PredicateToJoinRewriter {}; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/rewrite_rule.h b/src/observer/sql/optimizer/rewrite_rule.h index 90061d063..bd2efeb00 100644 --- a/src/observer/sql/optimizer/rewrite_rule.h +++ b/src/observer/sql/optimizer/rewrite_rule.h @@ -46,4 +46,4 @@ class ExpressionRewriteRule virtual RC rewrite(unique_ptr &expr, bool &change_made) = 0; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/rewriter.cpp b/src/observer/sql/optimizer/rewriter.cpp index 0db3b79ca..ac4d8e326 100644 --- a/src/observer/sql/optimizer/rewriter.cpp +++ b/src/observer/sql/optimizer/rewriter.cpp @@ -66,4 +66,4 @@ RC Rewriter::rewrite(unique_ptr &oper, bool &change_made) } return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/rewriter.h b/src/observer/sql/optimizer/rewriter.h index e2253217d..e53ed217f 100644 --- a/src/observer/sql/optimizer/rewriter.h +++ b/src/observer/sql/optimizer/rewriter.h @@ -52,4 +52,4 @@ class Rewriter private: vector> rewrite_rules_; }; -} +} // namespace oceanbase diff --git a/src/observer/sql/optimizer/statistics/table_statistics.h b/src/observer/sql/optimizer/statistics/table_statistics.h index 94c939bda..6fd3698fc 100644 --- a/src/observer/sql/optimizer/statistics/table_statistics.h +++ b/src/observer/sql/optimizer/statistics/table_statistics.h @@ -14,4 +14,4 @@ namespace oceanbase { class TableStatistics {}; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/parser/expression_binder.cpp b/src/observer/sql/parser/expression_binder.cpp index 4a58f8b91..8ff77c7b1 100644 --- a/src/observer/sql/parser/expression_binder.cpp +++ b/src/observer/sql/parser/expression_binder.cpp @@ -386,7 +386,7 @@ RC check_aggregate_expression(AggregateExpr &expression) } // 子表达式中不能再包含聚合表达式 - function&)> check_aggregate_expr = [&](unique_ptr &expr) -> RC { + function &)> check_aggregate_expr = [&](unique_ptr &expr) -> RC { RC rc = RC::SUCCESS; if (expr->type() == ExprType::AGGREGATION) { LOG_WARN("aggregate expression cannot be nested"); @@ -408,10 +408,10 @@ RC ExpressionBinder::bind_aggregate_expression( return RC::SUCCESS; } - auto unbound_aggregate_expr = static_cast(expr.get()); - const char *aggregate_name = unbound_aggregate_expr->aggregate_name(); + auto unbound_aggregate_expr = static_cast(expr.get()); + const char *aggregate_name = unbound_aggregate_expr->aggregate_name(); AggregateExpr::Type aggregate_type; - RC rc = AggregateExpr::type_from_string(aggregate_name, aggregate_type); + RC rc = AggregateExpr::type_from_string(aggregate_name, aggregate_type); if (OB_FAIL(rc)) { LOG_WARN("invalid aggregate name: %s", aggregate_name); return rc; @@ -449,4 +449,4 @@ RC ExpressionBinder::bind_aggregate_expression( bound_expressions.emplace_back(std::move(aggregate_expr)); return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/parser/expression_binder.h b/src/observer/sql/parser/expression_binder.h index 84cbce6c7..2accb78a2 100644 --- a/src/observer/sql/parser/expression_binder.h +++ b/src/observer/sql/parser/expression_binder.h @@ -65,4 +65,4 @@ class ExpressionBinder private: BinderContext &context_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/parser/parse.cpp b/src/observer/sql/parser/parse.cpp index b163e5449..3ef65c261 100644 --- a/src/observer/sql/parser/parse.cpp +++ b/src/observer/sql/parser/parse.cpp @@ -24,10 +24,7 @@ ParsedSqlNode::ParsedSqlNode() : flag(SCF_ERROR) {} ParsedSqlNode::ParsedSqlNode(SqlCommandFlag _flag) : flag(_flag) {} -void ParsedSqlResult::add_sql_node(unique_ptr sql_node) -{ - sql_nodes_.emplace_back(std::move(sql_node)); -} +void ParsedSqlResult::add_sql_node(unique_ptr sql_node) { sql_nodes_.emplace_back(std::move(sql_node)); } //////////////////////////////////////////////////////////////////////////////// @@ -38,4 +35,4 @@ RC parse(const char *st, ParsedSqlResult *sql_result) sql_parse(st, sql_result); return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/parser/parse_defs.h b/src/observer/sql/parser/parse_defs.h index 5b04eb4b4..c07dd07e1 100644 --- a/src/observer/sql/parser/parse_defs.h +++ b/src/observer/sql/parser/parse_defs.h @@ -339,4 +339,4 @@ class ParsedSqlResult private: vector> sql_nodes_; ///< 这里记录SQL命令。虽然看起来支持多个，但是当前仅处理一个 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/parser/parse_stage.cpp b/src/observer/sql/parser/parse_stage.cpp index 698ff7ae1..f8093cc1e 100644 --- a/src/observer/sql/parser/parse_stage.cpp +++ b/src/observer/sql/parser/parse_stage.cpp @@ -32,7 +32,7 @@ RC ParseStage::handle_request(SQLStageEvent *sql_event) { RC rc = RC::SUCCESS; - SqlResult *sql_result = sql_event->session_event()->sql_result(); + SqlResult *sql_result = sql_event->session_event()->sql_result(); const string &sql = sql_event->sql(); ParsedSqlResult parsed_sql_result; @@ -61,4 +61,4 @@ RC ParseStage::handle_request(SQLStageEvent *sql_event) return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/parser/parse_stage.h b/src/observer/sql/parser/parse_stage.h index b0ef49be3..275a32267 100644 --- a/src/observer/sql/parser/parse_stage.h +++ b/src/observer/sql/parser/parse_stage.h @@ -29,4 +29,4 @@ class ParseStage public: RC handle_request(SQLStageEvent *sql_event); }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/parser/resolve_stage.cpp b/src/observer/sql/parser/resolve_stage.cpp index 944f00c1a..e6e223031 100644 --- a/src/observer/sql/parser/resolve_stage.cpp +++ b/src/observer/sql/parser/resolve_stage.cpp @@ -58,4 +58,4 @@ RC ResolveStage::handle_request(SQLStageEvent *sql_event) return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/parser/resolve_stage.h b/src/observer/sql/parser/resolve_stage.h index 735b8ba96..dff4aa52c 100644 --- a/src/observer/sql/parser/resolve_stage.h +++ b/src/observer/sql/parser/resolve_stage.h @@ -29,4 +29,4 @@ class ResolveStage public: RC handle_request(SQLStageEvent *sql_event); }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/plan_cache/plan_cache_stage.h b/src/observer/sql/plan_cache/plan_cache_stage.h index b21ba221f..797eceee4 100644 --- a/src/observer/sql/plan_cache/plan_cache_stage.h +++ b/src/observer/sql/plan_cache/plan_cache_stage.h @@ -26,4 +26,4 @@ namespace oceanbase { */ class PlanCacheStage {}; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/query_cache/query_cache_stage.cpp b/src/observer/sql/query_cache/query_cache_stage.cpp index 7615ec201..f2daf5239 100644 --- a/src/observer/sql/query_cache/query_cache_stage.cpp +++ b/src/observer/sql/query_cache/query_cache_stage.cpp @@ -25,8 +25,5 @@ using namespace common; namespace oceanbase { -RC QueryCacheStage::handle_request(SQLStageEvent *sql_event) -{ - return RC::SUCCESS; -} -} \ No newline at end of file +RC QueryCacheStage::handle_request(SQLStageEvent *sql_event) { return RC::SUCCESS; } +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/query_cache/query_cache_stage.h b/src/observer/sql/query_cache/query_cache_stage.h index e261e7c4c..7a0eb0229 100644 --- a/src/observer/sql/query_cache/query_cache_stage.h +++ b/src/observer/sql/query_cache/query_cache_stage.h @@ -34,4 +34,4 @@ class QueryCacheStage public: RC handle_request(SQLStageEvent *sql_event); }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/analyze_table_stmt.cpp b/src/observer/sql/stmt/analyze_table_stmt.cpp index be595a7ff..f028c18a2 100644 --- a/src/observer/sql/stmt/analyze_table_stmt.cpp +++ b/src/observer/sql/stmt/analyze_table_stmt.cpp @@ -21,4 +21,4 @@ RC AnalyzeTableStmt::create(Db *db, const AnalyzeTableSqlNode &analyze_table, St stmt = new AnalyzeTableStmt(analyze_table.relation_name); return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/analyze_table_stmt.h b/src/observer/sql/stmt/analyze_table_stmt.h index ca809e81d..7d7952a71 100644 --- a/src/observer/sql/stmt/analyze_table_stmt.h +++ b/src/observer/sql/stmt/analyze_table_stmt.h @@ -35,4 +35,4 @@ class AnalyzeTableStmt : public Stmt private: string table_name_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/calc_stmt.h b/src/observer/sql/stmt/calc_stmt.h index dd136df04..ad35a204c 100644 --- a/src/observer/sql/stmt/calc_stmt.h +++ b/src/observer/sql/stmt/calc_stmt.h @@ -50,4 +50,4 @@ class CalcStmt : public Stmt private: vector> expressions_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/create_index_stmt.cpp b/src/observer/sql/stmt/create_index_stmt.cpp index d69dfebe5..a01ed62b6 100644 --- a/src/observer/sql/stmt/create_index_stmt.cpp +++ b/src/observer/sql/stmt/create_index_stmt.cpp @@ -58,4 +58,4 @@ RC CreateIndexStmt::create(Db *db, const CreateIndexSqlNode &create_index, Stmt stmt = new CreateIndexStmt(table, field_meta, create_index.index_name); return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/create_index_stmt.h b/src/observer/sql/stmt/create_index_stmt.h index 9fa6076c9..57ebb1948 100644 --- a/src/observer/sql/stmt/create_index_stmt.h +++ b/src/observer/sql/stmt/create_index_stmt.h @@ -49,4 +49,4 @@ class CreateIndexStmt : public Stmt const FieldMeta *field_meta_ = nullptr; string index_name_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/create_table_stmt.cpp b/src/observer/sql/stmt/create_table_stmt.cpp index 793848055..29cba6537 100644 --- a/src/observer/sql/stmt/create_table_stmt.cpp +++ b/src/observer/sql/stmt/create_table_stmt.cpp @@ -25,12 +25,14 @@ RC CreateTableStmt::create(Db *db, const CreateTableSqlNode &create_table, Stmt if (storage_format == StorageFormat::UNKNOWN_FORMAT) { return RC::INVALID_ARGUMENT; } - stmt = new CreateTableStmt(create_table.relation_name, create_table.attr_infos, create_table.primary_keys, storage_format); + stmt = new CreateTableStmt( + create_table.relation_name, create_table.attr_infos, create_table.primary_keys, storage_format); sql_debug("create table statement: table name %s", create_table.relation_name.c_str()); return RC::SUCCESS; } -StorageFormat CreateTableStmt::get_storage_format(const char *format_str) { +StorageFormat CreateTableStmt::get_storage_format(const char *format_str) +{ StorageFormat format = StorageFormat::UNKNOWN_FORMAT; if (strlen(format_str) == 0) { format = StorageFormat::ROW_FORMAT; @@ -43,4 +45,4 @@ StorageFormat CreateTableStmt::get_storage_format(const char *format_str) { } return format; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/create_table_stmt.h b/src/observer/sql/stmt/create_table_stmt.h index 8468ba962..62495f6a9 100644 --- a/src/observer/sql/stmt/create_table_stmt.h +++ b/src/observer/sql/stmt/create_table_stmt.h @@ -52,4 +52,4 @@ class CreateTableStmt : public Stmt vector primary_keys_; StorageFormat storage_format_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/delete_stmt.cpp b/src/observer/sql/stmt/delete_stmt.cpp index 9c10fbf16..dec59b169 100644 --- a/src/observer/sql/stmt/delete_stmt.cpp +++ b/src/observer/sql/stmt/delete_stmt.cpp @@ -59,4 +59,4 @@ RC DeleteStmt::create(Db *db, const DeleteSqlNode &delete_sql, Stmt *&stmt) stmt = new DeleteStmt(table, filter_stmt); return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/delete_stmt.h b/src/observer/sql/stmt/delete_stmt.h index 7718d1882..b4232e3a7 100644 --- a/src/observer/sql/stmt/delete_stmt.h +++ b/src/observer/sql/stmt/delete_stmt.h @@ -44,4 +44,4 @@ class DeleteStmt : public Stmt Table *table_ = nullptr; FilterStmt *filter_stmt_ = nullptr; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/desc_table_stmt.cpp b/src/observer/sql/stmt/desc_table_stmt.cpp index d7c813a67..6bcdef616 100644 --- a/src/observer/sql/stmt/desc_table_stmt.cpp +++ b/src/observer/sql/stmt/desc_table_stmt.cpp @@ -25,4 +25,4 @@ RC DescTableStmt::create(Db *db, const DescTableSqlNode &desc_table, Stmt *&stmt stmt = new DescTableStmt(desc_table.relation_name); return RC::SUCCESS; } -} +} // namespace oceanbase diff --git a/src/observer/sql/stmt/desc_table_stmt.h b/src/observer/sql/stmt/desc_table_stmt.h index 155c72ddf..bfccd6236 100644 --- a/src/observer/sql/stmt/desc_table_stmt.h +++ b/src/observer/sql/stmt/desc_table_stmt.h @@ -40,4 +40,4 @@ class DescTableStmt : public Stmt private: string table_name_; }; -} +} // namespace oceanbase diff --git a/src/observer/sql/stmt/exit_stmt.h b/src/observer/sql/stmt/exit_stmt.h index 9f2709623..4efa2460a 100644 --- a/src/observer/sql/stmt/exit_stmt.h +++ b/src/observer/sql/stmt/exit_stmt.h @@ -36,4 +36,4 @@ class ExitStmt : public Stmt return RC::SUCCESS; } }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/explain_stmt.cpp b/src/observer/sql/stmt/explain_stmt.cpp index 39454e5e0..6a085b9e1 100644 --- a/src/observer/sql/stmt/explain_stmt.cpp +++ b/src/observer/sql/stmt/explain_stmt.cpp @@ -30,7 +30,7 @@ RC ExplainStmt::create(Db *db, const ExplainSqlNode &explain, Stmt *&stmt) } unique_ptr child_stmt_ptr = unique_ptr(child_stmt); - stmt = new ExplainStmt(std::move(child_stmt_ptr)); + stmt = new ExplainStmt(std::move(child_stmt_ptr)); return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/explain_stmt.h b/src/observer/sql/stmt/explain_stmt.h index c8180f12b..23763fdd3 100644 --- a/src/observer/sql/stmt/explain_stmt.h +++ b/src/observer/sql/stmt/explain_stmt.h @@ -37,4 +37,4 @@ class ExplainStmt : public Stmt private: unique_ptr child_stmt_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/filter_stmt.cpp b/src/observer/sql/stmt/filter_stmt.cpp index 74d8c44f2..9a27f8c64 100644 --- a/src/observer/sql/stmt/filter_stmt.cpp +++ b/src/observer/sql/stmt/filter_stmt.cpp @@ -52,8 +52,8 @@ RC FilterStmt::create(Db *db, Table *default_table, unordered_map *tables, - const RelAttrSqlNode &attr, Table *&table, const FieldMeta *&field) +RC get_table_and_field(Db *db, Table *default_table, unordered_map *tables, const RelAttrSqlNode &attr, + Table *&table, const FieldMeta *&field) { if (common::is_blank(attr.relation_name.c_str())) { table = default_table; @@ -132,4 +132,4 @@ RC FilterStmt::create_filter_unit(Db *db, Table *default_table, unordered_map filter_units_; // 默认当前都是AND关系 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/help_stmt.h b/src/observer/sql/stmt/help_stmt.h index 4fd2c30b6..b63bc2c4b 100644 --- a/src/observer/sql/stmt/help_stmt.h +++ b/src/observer/sql/stmt/help_stmt.h @@ -39,4 +39,4 @@ class HelpStmt : public Stmt return RC::SUCCESS; } }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/insert_stmt.cpp b/src/observer/sql/stmt/insert_stmt.cpp index 032918a65..61c53c987 100644 --- a/src/observer/sql/stmt/insert_stmt.cpp +++ b/src/observer/sql/stmt/insert_stmt.cpp @@ -53,4 +53,4 @@ RC InsertStmt::create(Db *db, const InsertSqlNode &inserts, Stmt *&stmt) stmt = new InsertStmt(table, values, value_num); return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/insert_stmt.h b/src/observer/sql/stmt/insert_stmt.h index 54fa2700d..19d823f1b 100644 --- a/src/observer/sql/stmt/insert_stmt.h +++ b/src/observer/sql/stmt/insert_stmt.h @@ -47,4 +47,4 @@ class InsertStmt : public Stmt const Value *values_ = nullptr; int value_amount_ = 0; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/load_data_stmt.cpp b/src/observer/sql/stmt/load_data_stmt.cpp index ca1ef4c32..e5a07dbfe 100644 --- a/src/observer/sql/stmt/load_data_stmt.cpp +++ b/src/observer/sql/stmt/load_data_stmt.cpp @@ -57,4 +57,4 @@ RC LoadDataStmt::create(Db *db, const LoadDataSqlNode &load_data, Stmt *&stmt) stmt = new LoadDataStmt(table, load_data.file_name.c_str(), load_data.terminated[1], load_data.enclosed[1]); return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/load_data_stmt.h b/src/observer/sql/stmt/load_data_stmt.h index e5435e89f..8472792f5 100644 --- a/src/observer/sql/stmt/load_data_stmt.h +++ b/src/observer/sql/stmt/load_data_stmt.h @@ -43,4 +43,4 @@ class LoadDataStmt : public Stmt char terminated_; char enclosed_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/select_stmt.cpp b/src/observer/sql/stmt/select_stmt.cpp index f2c201dc5..1d68247e6 100644 --- a/src/observer/sql/stmt/select_stmt.cpp +++ b/src/observer/sql/stmt/select_stmt.cpp @@ -65,8 +65,8 @@ RC SelectStmt::create(Db *db, SelectSqlNode &select_sql, Stmt *&stmt) // collect query fields in `select` statement vector> bound_expressions; - ExpressionBinder expression_binder(binder_context); - + ExpressionBinder expression_binder(binder_context); + for (unique_ptr &expression : select_sql.expressions) { RC rc = expression_binder.bind_expression(expression, bound_expressions); if (OB_FAIL(rc)) { @@ -109,7 +109,7 @@ RC SelectStmt::create(Db *db, SelectSqlNode &select_sql, Stmt *&stmt) select_stmt->query_expressions_.swap(bound_expressions); select_stmt->filter_stmt_ = filter_stmt; select_stmt->group_by_.swap(group_by_expressions); - stmt = select_stmt; + stmt = select_stmt; return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/select_stmt.h b/src/observer/sql/stmt/select_stmt.h index fc4170c66..ba0544120 100644 --- a/src/observer/sql/stmt/select_stmt.h +++ b/src/observer/sql/stmt/select_stmt.h @@ -53,4 +53,4 @@ class SelectStmt : public Stmt FilterStmt *filter_stmt_ = nullptr; vector> group_by_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/set_variable_stmt.h b/src/observer/sql/stmt/set_variable_stmt.h index 5605abec9..51701610c 100644 --- a/src/observer/sql/stmt/set_variable_stmt.h +++ b/src/observer/sql/stmt/set_variable_stmt.h @@ -46,4 +46,4 @@ class SetVariableStmt : public Stmt private: SetVariableSqlNode set_variable_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/show_tables_stmt.h b/src/observer/sql/stmt/show_tables_stmt.h index 4a8ef0130..ec00f6a25 100644 --- a/src/observer/sql/stmt/show_tables_stmt.h +++ b/src/observer/sql/stmt/show_tables_stmt.h @@ -42,4 +42,4 @@ class ShowTablesStmt : public Stmt return RC::SUCCESS; } }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/stmt.cpp b/src/observer/sql/stmt/stmt.cpp index 5eefacddf..d2cde730c 100644 --- a/src/observer/sql/stmt/stmt.cpp +++ b/src/observer/sql/stmt/stmt.cpp @@ -78,7 +78,7 @@ RC Stmt::create_stmt(Db *db, ParsedSqlNode &sql_node, Stmt *&stmt) return DescTableStmt::create(db, sql_node.desc_table, stmt); } - case SCF_ANALYZE_TABLE: { + case SCF_ANALYZE_TABLE: { return AnalyzeTableStmt::create(db, sql_node.analyze_table, stmt); } @@ -121,4 +121,4 @@ RC Stmt::create_stmt(Db *db, ParsedSqlNode &sql_node, Stmt *&stmt) } return RC::UNIMPLEMENTED; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/stmt.h b/src/observer/sql/stmt/stmt.h index 5ba81cec9..e40730957 100644 --- a/src/observer/sql/stmt/stmt.h +++ b/src/observer/sql/stmt/stmt.h @@ -94,4 +94,4 @@ class Stmt private: }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/trx_begin_stmt.h b/src/observer/sql/stmt/trx_begin_stmt.h index 12cbc6dde..74c1f2d4b 100644 --- a/src/observer/sql/stmt/trx_begin_stmt.h +++ b/src/observer/sql/stmt/trx_begin_stmt.h @@ -39,4 +39,4 @@ class TrxBeginStmt : public Stmt return RC::SUCCESS; } }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/trx_end_stmt.h b/src/observer/sql/stmt/trx_end_stmt.h index 9f73b0f9d..6214b4f51 100644 --- a/src/observer/sql/stmt/trx_end_stmt.h +++ b/src/observer/sql/stmt/trx_end_stmt.h @@ -43,4 +43,4 @@ class TrxEndStmt : public Stmt private: StmtType type_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/update_stmt.cpp b/src/observer/sql/stmt/update_stmt.cpp index c3dd9bb5c..46810ae91 100644 --- a/src/observer/sql/stmt/update_stmt.cpp +++ b/src/observer/sql/stmt/update_stmt.cpp @@ -26,4 +26,4 @@ RC UpdateStmt::create(Db *db, const UpdateSqlNode &update, Stmt *&stmt) stmt = nullptr; return RC::INTERNAL; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/stmt/update_stmt.h b/src/observer/sql/stmt/update_stmt.h index 36b39ebb9..50b679545 100644 --- a/src/observer/sql/stmt/update_stmt.h +++ b/src/observer/sql/stmt/update_stmt.h @@ -44,4 +44,4 @@ class UpdateStmt : public Stmt Value *values_ = nullptr; int value_amount_ = 0; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/buffer/buffer_pool_log.cpp b/src/observer/storage/buffer/buffer_pool_log.cpp index 9176aab9c..70f42e7ce 100644 --- a/src/observer/storage/buffer/buffer_pool_log.cpp +++ b/src/observer/storage/buffer/buffer_pool_log.cpp @@ -21,8 +21,7 @@ namespace oceanbase { string BufferPoolLogEntry::to_string() const { - return string("buffer_pool_id=") + std::to_string(buffer_pool_id) + - ", page_num=" + std::to_string(page_num) + + return string("buffer_pool_id=") + std::to_string(buffer_pool_id) + ", page_num=" + std::to_string(page_num) + ", operation_type=" + BufferPoolOperation(operation_type).to_string(); } @@ -42,25 +41,22 @@ RC BufferPoolLogHandler::deallocate_page(PageNum page_num, LSN &lsn) return append_log(BufferPoolOperation::Type::DEALLOCATE, page_num, lsn); } -RC BufferPoolLogHandler::flush_page(Page &page) -{ - return log_handler_.wait_lsn(page.lsn); -} +RC BufferPoolLogHandler::flush_page(Page &page) { return log_handler_.wait_lsn(page.lsn); } RC BufferPoolLogHandler::append_log(BufferPoolOperation::Type type, PageNum page_num, LSN &lsn) { BufferPoolLogEntry log; log.buffer_pool_id = buffer_pool_.id(); - log.page_num = page_num; + log.page_num = page_num; log.operation_type = BufferPoolOperation(type).type_id(); - return log_handler_.append(lsn, LogModule::Id::BUFFER_POOL, span(reinterpret_cast(&log), sizeof(log))); + return log_handler_.append( + lsn, LogModule::Id::BUFFER_POOL, span(reinterpret_cast(&log), sizeof(log))); } //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // BufferPoolLogReplayer -BufferPoolLogReplayer::BufferPoolLogReplayer(BufferPoolManager &bp_manager) : bp_manager_(bp_manager) -{} +BufferPoolLogReplayer::BufferPoolLogReplayer(BufferPoolManager &bp_manager) : bp_manager_(bp_manager) {} RC BufferPoolLogReplayer::replay(const LogEntry &entry) { @@ -73,10 +69,10 @@ RC BufferPoolLogReplayer::replay(const LogEntry &entry) auto log = reinterpret_cast(entry.data()); LOG_TRACE("replay buffer pool log. entry=%s, log=%s", entry.to_string().c_str(), log->to_string().c_str()); - - int32_t buffer_pool_id = log->buffer_pool_id; - DiskBufferPool *buffer_pool = nullptr; - RC rc = bp_manager_.get_buffer_pool(buffer_pool_id, buffer_pool); + + int32_t buffer_pool_id = log->buffer_pool_id; + DiskBufferPool *buffer_pool = nullptr; + RC rc = bp_manager_.get_buffer_pool(buffer_pool_id, buffer_pool); if (OB_FAIL(rc) || buffer_pool == nullptr) { LOG_ERROR("failed to get buffer pool. rc=%s, buffer pool=%p, log=%s, %s", strrc(rc), buffer_pool, entry.to_string().c_str(), log->to_string().c_str()); @@ -84,16 +80,13 @@ RC BufferPoolLogReplayer::replay(const LogEntry &entry) } BufferPoolOperation operation(log->operation_type); - switch (operation.type()) - { - case BufferPoolOperation::Type::ALLOCATE: - return buffer_pool->redo_allocate_page(entry.lsn(), log->page_num); - case BufferPoolOperation::Type::DEALLOCATE: - return buffer_pool->redo_deallocate_page(entry.lsn(), log->page_num); + switch (operation.type()) { + case BufferPoolOperation::Type::ALLOCATE: return buffer_pool->redo_allocate_page(entry.lsn(), log->page_num); + case BufferPoolOperation::Type::DEALLOCATE: return buffer_pool->redo_deallocate_page(entry.lsn(), log->page_num); default: LOG_ERROR("unknown buffer pool operation. operation=%s", operation.to_string().c_str()); return RC::INTERNAL; } return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/buffer/buffer_pool_log.h b/src/observer/storage/buffer/buffer_pool_log.h index 57d80f444..af87b7033 100644 --- a/src/observer/storage/buffer/buffer_pool_log.h +++ b/src/observer/storage/buffer/buffer_pool_log.h @@ -129,4 +129,4 @@ class BufferPoolLogReplayer final : public LogReplayer private: BufferPoolManager &bp_manager_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/buffer/disk_buffer_pool.cpp b/src/observer/storage/buffer/disk_buffer_pool.cpp index 5138c8d04..183d5befc 100644 --- a/src/observer/storage/buffer/disk_buffer_pool.cpp +++ b/src/observer/storage/buffer/disk_buffer_pool.cpp @@ -105,7 +105,7 @@ int BPFrameManager::purge_frames(int count, function purger) Frame *BPFrameManager::get(int buffer_pool_id, PageNum page_num) { - FrameId frame_id(buffer_pool_id, page_num); + FrameId frame_id(buffer_pool_id, page_num); lock_guard lock_guard(lock_); return get_internal(frame_id); @@ -128,7 +128,7 @@ Frame *BPFrameManager::alloc(int buffer_pool_id, PageNum page_num) lock_guard lock_guard(lock_); - Frame *frame = get_internal(frame_id); + Frame *frame = get_internal(frame_id); if (frame != nullptr) { return frame; } @@ -174,7 +174,7 @@ list BPFrameManager::find_list(int buffer_pool_id) lock_guard lock_guard(lock_); list frames; - auto fetcher = [&frames, buffer_pool_id](const FrameId &frame_id, Frame *const frame) -> bool { + auto fetcher = [&frames, buffer_pool_id](const FrameId &frame_id, Frame *const frame) -> bool { if (buffer_pool_id == frame_id.buffer_pool_id()) { frame->pin(); frames.push_back(frame); @@ -217,9 +217,12 @@ RC BufferPoolIterator::reset() } //////////////////////////////////////////////////////////////////////////////// -DiskBufferPool::DiskBufferPool( - BufferPoolManager &bp_manager, BPFrameManager &frame_manager, DoubleWriteBuffer &dblwr_manager, LogHandler &log_handler) - : bp_manager_(bp_manager), frame_manager_(frame_manager), dblwr_manager_(dblwr_manager), log_handler_(*this, log_handler) +DiskBufferPool::DiskBufferPool(BufferPoolManager &bp_manager, BPFrameManager &frame_manager, + DoubleWriteBuffer &dblwr_manager, LogHandler &log_handler) + : bp_manager_(bp_manager), + frame_manager_(frame_manager), + dblwr_manager_(dblwr_manager), + log_handler_(*this, log_handler) {} DiskBufferPool::~DiskBufferPool() @@ -241,7 +244,7 @@ RC DiskBufferPool::open_file(const char *file_name) file_desc_ = fd; Page header_page; - int ret = readn(file_desc_, &header_page, sizeof(header_page)); + int ret = readn(file_desc_, &header_page, sizeof(header_page)); if (ret != 0) { LOG_ERROR("Failed to read first page of %s, due to %s.", file_name, strerror(errno)); close(fd); @@ -250,7 +253,7 @@ RC DiskBufferPool::open_file(const char *file_name) } BPFileHeader *tmp_file_header = reinterpret_cast(header_page.data); - buffer_pool_id_ = tmp_file_header->buffer_pool_id; + buffer_pool_id_ = tmp_file_header->buffer_pool_id; RC rc = allocate_frame(BP_HEADER_PAGE, &hdr_frame_); if (rc != RC::SUCCESS) { @@ -368,7 +371,7 @@ RC DiskBufferPool::allocate_page(Frame **frame) // TODO, do we need clean the loaded page's data? hdr_frame_->mark_dirty(); LSN lsn = 0; - rc = log_handler_.allocate_page(i, lsn); + rc = log_handler_.allocate_page(i, lsn); if (OB_FAIL(rc)) { LOG_ERROR("Failed to log allocate page %d, rc=%s", i, strrc(rc)); // 忽略了错误 @@ -392,7 +395,7 @@ RC DiskBufferPool::allocate_page(Frame **frame) } LSN lsn = 0; - rc = log_handler_.allocate_page(file_header_->page_count, lsn); + rc = log_handler_.allocate_page(file_header_->page_count, lsn); if (OB_FAIL(rc)) { LOG_ERROR("Failed to log allocate page %d, rc=%s", file_header_->page_count, strrc(rc)); // 忽略了错误 @@ -442,9 +445,9 @@ RC DiskBufferPool::dispose_page(PageNum page_num) LOG_ERROR("Failed to dispose page %d, because it is the first page. filename=%s", page_num, file_name_.c_str()); return RC::INTERNAL; } - + scoped_lock lock_guard(lock_); - Frame *used_frame = frame_manager_.get(id(), page_num); + Frame *used_frame = frame_manager_.get(id(), page_num); if (used_frame != nullptr) { ASSERT("the page try to dispose is in use. frame:%s", used_frame->to_string().c_str()); frame_manager_.free(id(), page_num, used_frame); @@ -453,7 +456,7 @@ RC DiskBufferPool::dispose_page(PageNum page_num) } LSN lsn = 0; - RC rc = log_handler_.deallocate_page(page_num, lsn); + RC rc = log_handler_.deallocate_page(page_num, lsn); if (OB_FAIL(rc)) { LOG_ERROR("Failed to log deallocate page %d, rc=%s", page_num, strrc(rc)); // ignore error handle @@ -498,7 +501,7 @@ RC DiskBufferPool::purge_page(PageNum page_num) { scoped_lock lock_guard(lock_); - Frame *used_frame = frame_manager_.get(id(), page_num); + Frame *used_frame = frame_manager_.get(id(), page_num); if (used_frame != nullptr) { return purge_frame(page_num, used_frame); } @@ -653,7 +656,7 @@ RC DiskBufferPool::redo_allocate_page(LSN lsn, PageNum page_num) file_header_->page_count++; hdr_frame_->set_lsn(lsn); hdr_frame_->mark_dirty(); - + // TODO 应该检查文件是否足够大，包含了当前新分配的页面 Bitmap bitmap(file_header_->bitmap, file_header_->page_count); @@ -737,13 +740,13 @@ RC DiskBufferPool::check_page_num(PageNum page_num) RC DiskBufferPool::load_page(PageNum page_num, Frame *frame) { Page &page = frame->page(); - RC rc = dblwr_manager_.read_page(this, page_num, page); + RC rc = dblwr_manager_.read_page(this, page_num, page); if (OB_SUCC(rc)) { return rc; } scoped_lock lock_guard(wr_lock_); - int64_t offset = ((int64_t)page_num) * BP_PAGE_SIZE; + int64_t offset = ((int64_t)page_num) * BP_PAGE_SIZE; if (lseek(file_desc_, offset, SEEK_SET) == -1) { LOG_ERROR("Failed to load page %s:%d, due to failed to lseek:%s.", file_name_.c_str(), page_num, strerror(errno)); @@ -897,7 +900,7 @@ RC BufferPoolManager::flush_page(Frame &frame) int buffer_pool_id = frame.buffer_pool_id(); scoped_lock lock_guard(lock_); - auto iter = id_to_buffer_pools_.find(buffer_pool_id); + auto iter = id_to_buffer_pools_.find(buffer_pool_id); if (iter == id_to_buffer_pools_.end()) { LOG_WARN("unknown buffer pool of id %d", buffer_pool_id); return RC::INTERNAL; @@ -918,9 +921,9 @@ RC BufferPoolManager::get_buffer_pool(int32_t id, DiskBufferPool *&bp) LOG_WARN("unknown buffer pool of id %d", id); return RC::INTERNAL; } - + bp = iter->second; return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/buffer/disk_buffer_pool.h b/src/observer/storage/buffer/disk_buffer_pool.h index cb12ea88b..b3c4e4706 100644 --- a/src/observer/storage/buffer/disk_buffer_pool.h +++ b/src/observer/storage/buffer/disk_buffer_pool.h @@ -354,6 +354,6 @@ class BufferPoolManager final common::Mutex lock_; unordered_map buffer_pools_; unordered_map id_to_buffer_pools_; - atomic next_buffer_pool_id_{1}; // 系统启动时，会打开所有的表，这样就可以知道当前系统最大的ID是多少了 + atomic next_buffer_pool_id_{1}; // 系统启动时，会打开所有的表，这样就可以知道当前系统最大的ID是多少了 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/buffer/double_write_buffer.cpp b/src/observer/storage/buffer/double_write_buffer.cpp index 690e7e8e0..714cc79b2 100644 --- a/src/observer/storage/buffer/double_write_buffer.cpp +++ b/src/observer/storage/buffer/double_write_buffer.cpp @@ -32,25 +32,24 @@ struct DoubleWritePage public: DoubleWritePageKey key; - int32_t page_index = -1; /// 页面在double write buffer文件中的页索引 - bool valid = true; /// 表示页面是否有效，在页面被删除时，需要同时标记磁盘上的值。 + int32_t page_index = -1; /// 页面在double write buffer文件中的页索引 + bool valid = true; /// 表示页面是否有效，在页面被删除时，需要同时标记磁盘上的值。 Page page; static const int32_t SIZE; }; DoubleWritePage::DoubleWritePage(int32_t buffer_pool_id, PageNum page_num, int32_t page_index, Page &_page) - : key{buffer_pool_id, page_num}, page_index(page_index), page(_page) + : key{buffer_pool_id, page_num}, page_index(page_index), page(_page) {} const int32_t DoubleWritePage::SIZE = sizeof(DoubleWritePage); const int32_t DoubleWriteBufferHeader::SIZE = sizeof(DoubleWriteBufferHeader); -DiskDoubleWriteBuffer::DiskDoubleWriteBuffer(BufferPoolManager &bp_manager, int max_pages /*=16*/) - : max_pages_(max_pages), bp_manager_(bp_manager) -{ -} +DiskDoubleWriteBuffer::DiskDoubleWriteBuffer(BufferPoolManager &bp_manager, int max_pages /*=16*/) + : max_pages_(max_pages), bp_manager_(bp_manager) +{} DiskDoubleWriteBuffer::~DiskDoubleWriteBuffer() { @@ -64,7 +63,7 @@ RC DiskDoubleWriteBuffer::open_file(const char *filename) LOG_ERROR("Double write buffer has already opened. file desc=%d", file_desc_); return RC::BUFFERPOOL_OPEN; } - + int fd = open(filename, O_CREAT | O_RDWR, 0644); if (fd < 0) { LOG_ERROR("Failed to open or creat %s, due to %s.", filename, strerror(errno)); @@ -97,9 +96,9 @@ RC DiskDoubleWriteBuffer::flush_page() RC DiskDoubleWriteBuffer::add_page(DiskBufferPool *bp, PageNum page_num, Page &page) { - scoped_lock lock_guard(lock_); + scoped_lock lock_guard(lock_); DoubleWritePageKey key{bp->id(), page_num}; - auto iter = dblwr_pages_.find(key); + auto iter = dblwr_pages_.find(key); if (iter != dblwr_pages_.end()) { iter->second->page = page; LOG_TRACE("[cache hit]add page into double write buffer. buffer_pool_id:%d,page_num:%d,lsn=%d, dwb size=%d", @@ -147,7 +146,7 @@ RC DiskDoubleWriteBuffer::add_page(DiskBufferPool *bp, PageNum page_num, Page &p RC DiskDoubleWriteBuffer::write_page_internal(DoubleWritePage *page) { int32_t page_index = page->page_index; - int64_t offset = page_index * DoubleWritePage::SIZE + DoubleWriteBufferHeader::SIZE; + int64_t offset = page_index * DoubleWritePage::SIZE + DoubleWriteBufferHeader::SIZE; if (lseek(file_desc_, offset, SEEK_SET) == -1) { LOG_ERROR("Failed to add page %lld of %d due to failed to seek %s.", offset, file_desc_, strerror(errno)); return RC::IOERR_SEEK; @@ -181,9 +180,9 @@ RC DiskDoubleWriteBuffer::write_page(DoubleWritePage *dblwr_page) RC DiskDoubleWriteBuffer::read_page(DiskBufferPool *bp, PageNum page_num, Page &page) { - scoped_lock lock_guard(lock_); + scoped_lock lock_guard(lock_); DoubleWritePageKey key{bp->id(), page_num}; - auto iter = dblwr_pages_.find(key); + auto iter = dblwr_pages_.find(key); if (iter != dblwr_pages_.end()) { page = iter->second->page; LOG_TRACE("double write buffer read page success. bp id=%d, page_num:%d, lsn:%d", bp->id(), page_num, page.lsn); @@ -196,7 +195,7 @@ RC DiskDoubleWriteBuffer::read_page(DiskBufferPool *bp, PageNum page_num, Page & RC DiskDoubleWriteBuffer::clear_pages(DiskBufferPool *buffer_pool) { vector spec_pages; - + auto remove_pred = [&spec_pages, buffer_pool](const pair &pair) { DoubleWritePage *dbl_page = pair.second; if (buffer_pool->id() == dbl_page->key.buffer_pool_id) { @@ -267,9 +266,9 @@ RC DiskDoubleWriteBuffer::load_pages() return RC::IOERR_SEEK; } - auto dblwr_page = make_unique(); - Page &page = dblwr_page->page; - page.check_sum = (CheckSum)-1; + auto dblwr_page = make_unique(); + Page &page = dblwr_page->page; + page.check_sum = (CheckSum)-1; ret = readn(file_desc_, dblwr_page.get(), DoubleWritePage::SIZE); if (ret != 0) { @@ -291,10 +290,7 @@ RC DiskDoubleWriteBuffer::load_pages() return RC::SUCCESS; } -RC DiskDoubleWriteBuffer::recover() -{ - return flush_page(); -} +RC DiskDoubleWriteBuffer::recover() { return flush_page(); } //////////////////////////////////////////////////////////////// RC VacuousDoubleWriteBuffer::add_page(DiskBufferPool *bp, PageNum page_num, Page &page) @@ -302,4 +298,4 @@ RC VacuousDoubleWriteBuffer::add_page(DiskBufferPool *bp, PageNum page_num, Page return bp->write_page(page_num, page); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/buffer/double_write_buffer.h b/src/observer/storage/buffer/double_write_buffer.h index 7a28e2f6e..9d373f1ab 100644 --- a/src/observer/storage/buffer/double_write_buffer.h +++ b/src/observer/storage/buffer/double_write_buffer.h @@ -169,4 +169,4 @@ class VacuousDoubleWriteBuffer : public DoubleWriteBuffer */ RC clear_pages(DiskBufferPool *bp) override { return RC::SUCCESS; } }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/buffer/frame.cpp b/src/observer/storage/buffer/frame.cpp index 1866c0aeb..d99ea076a 100644 --- a/src/observer/storage/buffer/frame.cpp +++ b/src/observer/storage/buffer/frame.cpp @@ -83,7 +83,13 @@ void Frame::write_latch(intptr_t xid) ++write_recursive_count_; TRACE("frame write lock success." "this=%p, pin=%d, frameId=%s, write locker=%lx(recursive=%d), xid=%lx, lbt=%s", - this, pin_count_.load(), frame_id_.to_string().c_str(), write_locker_, write_recursive_count_, xid, lbt()); + this, + pin_count_.load(), + frame_id_.to_string().c_str(), + write_locker_, + write_recursive_count_, + xid, + lbt()); #endif } @@ -105,7 +111,11 @@ void Frame::write_unlatch(intptr_t xid) write_locker_, this, pin_count_.load(), frame_id_.to_string().c_str(), xid, lbt()); TRACE("frame write unlock success. this=%p, pin=%d, frameId=%s, xid=%lx, lbt=%s", - this, pin_count_.load(), frame_id_.to_string().c_str(), xid, lbt()); + this, + pin_count_.load(), + frame_id_.to_string().c_str(), + xid, + lbt()); if (--write_recursive_count_ == 0) { write_locker_ = 0; @@ -140,7 +150,12 @@ void Frame::read_latch(intptr_t xid) ++read_lockers_[xid]; TRACE("frame read lock success." "this=%p, pin=%d, frameId=%s, xid=%lx, recursive=%d, lbt=%s", - this, pin_count_.load(), frame_id_.to_string().c_str(), xid, read_lockers_[xid], lbt()); + this, + pin_count_.load(), + frame_id_.to_string().c_str(), + xid, + read_lockers_[xid], + lbt()); #endif } } @@ -168,7 +183,12 @@ bool Frame::try_read_latch() ++read_lockers_[xid]; TRACE("frame read lock success." "this=%p, pin=%d, frameId=%s, xid=%lx, recursive=%d, lbt=%s", - this, pin_count_.load(), frame_id_.to_string().c_str(), xid, read_lockers_[xid], lbt()); + this, + pin_count_.load(), + frame_id_.to_string().c_str(), + xid, + read_lockers_[xid], + lbt()); debug_lock_.unlock(); #endif } @@ -205,7 +225,11 @@ void Frame::read_unlatch(intptr_t xid) TRACE("frame read unlock success." "this=%p, pin=%d, frameId=%s, xid=%lx, lbt=%s", - this, pin_count_.load(), frame_id_.to_string().c_str(), xid, lbt()); + this, + pin_count_.load(), + frame_id_.to_string().c_str(), + xid, + lbt()); lock_.unlock_shared(); } @@ -219,8 +243,13 @@ void Frame::pin() TRACE("after frame pin. " "this=%p, write locker=%lx, read locker has xid %d? pin=%d, frameId=%s, xid=%lx, lbt=%s", - this, write_locker_, read_lockers_.find(xid) != read_lockers_.end(), - pin_count, frame_id_.to_string().c_str(), xid, lbt()); + this, + write_locker_, + read_lockers_.find(xid) != read_lockers_.end(), + pin_count, + frame_id_.to_string().c_str(), + xid, + lbt()); } int Frame::unpin() @@ -237,8 +266,13 @@ int Frame::unpin() int pin_count = --pin_count_; TRACE("after frame unpin. " "this=%p, write locker=%lx, read locker has xid? %d, pin=%d, frameId=%s, xid=%lx, lbt=%s", - this, write_locker_, read_lockers_.find(xid) != read_lockers_.end(), - pin_count, frame_id_.to_string().c_str(), xid, lbt()); + this, + write_locker_, + read_lockers_.find(xid) != read_lockers_.end(), + pin_count, + frame_id_.to_string().c_str(), + xid, + lbt()); if (0 == pin_count) { ASSERT(write_locker_ == 0, @@ -263,8 +297,8 @@ void Frame::access() { acc_time_ = current_time(); } string Frame::to_string() const { stringstream ss; - ss << "frame id:" << frame_id().to_string() << ", dirty=" << dirty() << ", pin=" << pin_count() - << ", lsn=" << lsn() << ", this=" << this; + ss << "frame id:" << frame_id().to_string() << ", dirty=" << dirty() << ", pin=" << pin_count() << ", lsn=" << lsn() + << ", this=" << this; return ss.str(); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/buffer/frame.h b/src/observer/storage/buffer/frame.h index e2ae5657e..ceeb9b137 100644 --- a/src/observer/storage/buffer/frame.h +++ b/src/observer/storage/buffer/frame.h @@ -189,4 +189,4 @@ class Frame int write_recursive_count_ = 0; unordered_map read_lockers_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/buffer/page.h b/src/observer/storage/buffer/page.h index d3d8e27d9..d0de43743 100644 --- a/src/observer/storage/buffer/page.h +++ b/src/observer/storage/buffer/page.h @@ -38,4 +38,4 @@ struct Page CheckSum check_sum; char data[BP_PAGE_DATA_SIZE]; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/clog/disk_log_handler.cpp b/src/observer/storage/clog/disk_log_handler.cpp index 375c9a2a2..5c64efc80 100644 --- a/src/observer/storage/clog/disk_log_handler.cpp +++ b/src/observer/storage/clog/disk_log_handler.cpp @@ -77,7 +77,7 @@ RC DiskLogHandler::await_termination() RC DiskLogHandler::replay(LogReplayer &replayer, LSN start_lsn) { - LSN max_lsn = 0; + LSN max_lsn = 0; auto replay_callback = [&replayer, &max_lsn](LogEntry &entry) -> RC { if (entry.lsn() > max_lsn) { max_lsn = entry.lsn(); @@ -101,10 +101,10 @@ RC DiskLogHandler::replay(LogReplayer &replayer, LSN start_lsn) return rc; } -RC DiskLogHandler::iterate(function consumer, LSN start_lsn) +RC DiskLogHandler::iterate(function consumer, LSN start_lsn) { vector log_files; - RC rc = file_manager_.list_files(log_files, start_lsn); + RC rc = file_manager_.list_files(log_files, start_lsn); if (OB_FAIL(rc)) { LOG_WARN("failed to list clog files. rc=%s", strrc(rc)); return rc; @@ -174,7 +174,7 @@ void DiskLogHandler::thread_func() LOG_INFO("log handler thread started"); LogFileWriter file_writer; - + RC rc = RC::SUCCESS; while (running_.load() || entry_buffer_.entry_number() > 0) { if (!file_writer.valid() || rc == RC::LOG_FILE_FULL) { @@ -195,7 +195,7 @@ void DiskLogHandler::thread_func() } int flush_count = 0; - rc = entry_buffer_.flush(file_writer, flush_count); + rc = entry_buffer_.flush(file_writer, flush_count); if (OB_FAIL(rc) && RC::LOG_FILE_FULL != rc) { LOG_WARN("failed to flush log entry buffer. rc=%s", strrc(rc)); } @@ -208,4 +208,4 @@ void DiskLogHandler::thread_func() LOG_INFO("log handler thread stopped"); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/clog/disk_log_handler.h b/src/observer/storage/clog/disk_log_handler.h index 514fb26b9..369fcba95 100644 --- a/src/observer/storage/clog/disk_log_handler.h +++ b/src/observer/storage/clog/disk_log_handler.h @@ -129,4 +129,4 @@ class DiskLogHandler : public LogHandler string path_; /// 日志文件存放的目录 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/clog/integrated_log_replayer.cpp b/src/observer/storage/clog/integrated_log_replayer.cpp index facccc4bd..a50f7a24a 100644 --- a/src/observer/storage/clog/integrated_log_replayer.cpp +++ b/src/observer/storage/clog/integrated_log_replayer.cpp @@ -69,4 +69,4 @@ RC IntegratedLogReplayer::on_done() return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/clog/integrated_log_replayer.h b/src/observer/storage/clog/integrated_log_replayer.h index a94442bb1..7b4883739 100644 --- a/src/observer/storage/clog/integrated_log_replayer.h +++ b/src/observer/storage/clog/integrated_log_replayer.h @@ -60,4 +60,4 @@ class IntegratedLogReplayer : public LogReplayer BplusTreeLogReplayer bplus_tree_log_replayer_; ///< bplus tree 日志回放器 unique_ptr trx_log_replayer_; ///< trx 日志回放器 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/clog/log_buffer.cpp b/src/observer/storage/clog/log_buffer.cpp index 57b141d85..335d62174 100644 --- a/src/observer/storage/clog/log_buffer.cpp +++ b/src/observer/storage/clog/log_buffer.cpp @@ -46,7 +46,7 @@ RC LogEntryBuffer::append(LSN &lsn, LogModule module, vector &&data) } LogEntry entry; - RC rc = entry.init(lsn, module, std::move(data)); + RC rc = entry.init(lsn, module, std::move(data)); if (OB_FAIL(rc)) { LOG_WARN("failed to init log entry. rc=%s", strrc(rc)); return rc; @@ -80,7 +80,7 @@ RC LogEntryBuffer::flush(LogFileWriter &writer, int &count) entries_.pop_front(); bytes_ -= entry.total_size(); } - + RC rc = writer.write(entry); if (OB_FAIL(rc)) { lock_guard guard(mutex_); @@ -93,17 +93,11 @@ RC LogEntryBuffer::flush(LogFileWriter &writer, int &count) flushed_lsn_ = entry.lsn(); } } - + return RC::SUCCESS; } -int64_t LogEntryBuffer::bytes() const -{ - return bytes_.load(); -} +int64_t LogEntryBuffer::bytes() const { return bytes_.load(); } -int32_t LogEntryBuffer::entry_number() const -{ - return entries_.size(); -} -} \ No newline at end of file +int32_t LogEntryBuffer::entry_number() const { return entries_.size(); } +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/clog/log_buffer.h b/src/observer/storage/clog/log_buffer.h index db1ba42d3..365894638 100644 --- a/src/observer/storage/clog/log_buffer.h +++ b/src/observer/storage/clog/log_buffer.h @@ -70,7 +70,7 @@ class LogEntryBuffer LSN flushed_lsn() const { return flushed_lsn_.load(); } private: - mutex mutex_; /// 当前数据结构一定会在多线程中访问，所以强制使用有效的锁，而不是有条件生效的common::Mutex + mutex mutex_; /// 当前数据结构一定会在多线程中访问，所以强制使用有效的锁，而不是有条件生效的common::Mutex deque entries_; /// 日志缓冲区 atomic bytes_; /// 当前缓冲区中的日志数据大小 @@ -79,4 +79,4 @@ class LogEntryBuffer int32_t max_bytes_ = 4 * 1024 * 1024; /// 缓冲区最大字节数 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/clog/log_entry.cpp b/src/observer/storage/clog/log_entry.cpp index c3cdf5313..7d528a002 100644 --- a/src/observer/storage/clog/log_entry.cpp +++ b/src/observer/storage/clog/log_entry.cpp @@ -25,9 +25,7 @@ const int32_t LogHeader::SIZE = sizeof(LogHeader); string LogHeader::to_string() const { stringstream ss; - ss << "lsn=" << lsn - << ", size=" << size - << ", module_id=" << module_id << ":" << LogModule(module_id).name(); + ss << "lsn=" << lsn << ", size=" << size << ", module_id=" << module_id << ":" << LogModule(module_id).name(); return ss.str(); } @@ -36,16 +34,16 @@ string LogHeader::to_string() const // class LogEntry LogEntry::LogEntry() { - header_.lsn = 0; + header_.lsn = 0; header_.size = 0; } LogEntry::LogEntry(LogEntry &&other) { header_ = other.header_; - data_ = std::move(other.data_); + data_ = std::move(other.data_); - other.header_.lsn = 0; + other.header_.lsn = 0; other.header_.size = 0; } @@ -56,9 +54,9 @@ LogEntry &LogEntry::operator=(LogEntry &&other) } header_ = other.header_; - data_ = std::move(other.data_); + data_ = std::move(other.data_); - other.header_.lsn = 0; + other.header_.lsn = 0; other.header_.size = 0; return *this; @@ -76,15 +74,12 @@ RC LogEntry::init(LSN lsn, LogModule module, vector &&data) return RC::INVALID_ARGUMENT; } - header_.lsn = lsn; + header_.lsn = lsn; header_.module_id = module.index(); - header_.size = static_cast(data.size()); - data_ = std::move(data); + header_.size = static_cast(data.size()); + data_ = std::move(data); return RC::SUCCESS; } -string LogEntry::to_string() const -{ - return header_.to_string(); -} -} \ No newline at end of file +string LogEntry::to_string() const { return header_.to_string(); } +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/clog/log_entry.h b/src/observer/storage/clog/log_entry.h index 7557aa947..2cd3a607a 100644 --- a/src/observer/storage/clog/log_entry.h +++ b/src/observer/storage/clog/log_entry.h @@ -89,4 +89,4 @@ class LogEntry LogHeader header_; /// 日志头 vector data_; /// 日志数据 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/clog/log_file.cpp b/src/observer/storage/clog/log_file.cpp index 1b985bda6..6b39fc5ba 100644 --- a/src/observer/storage/clog/log_file.cpp +++ b/src/observer/storage/clog/log_file.cpp @@ -143,10 +143,7 @@ RC LogFileReader::skip_to(LSN start_lsn) } //////////////////////////////////////////////////////////////////////////////// // LogFileWriter -LogFileWriter::~LogFileWriter() -{ - (void)this->close(); -} +LogFileWriter::~LogFileWriter() { (void)this->close(); } RC LogFileWriter::open(const char *filename, int end_lsn) { @@ -155,7 +152,7 @@ RC LogFileWriter::open(const char *filename, int end_lsn) } filename_ = filename; - end_lsn_ = end_lsn; + end_lsn_ = end_lsn; fd_ = ::open(filename, O_WRONLY | O_APPEND | O_CREAT | O_SYNC, 0644); if (fd_ < 0) { @@ -216,27 +213,18 @@ RC LogFileWriter::write(LogEntry &entry) return RC::SUCCESS; } -bool LogFileWriter::valid() const -{ - return fd_ >= 0; -} +bool LogFileWriter::valid() const { return fd_ >= 0; } -bool LogFileWriter::full() const -{ - return last_lsn_ >= end_lsn_; -} +bool LogFileWriter::full() const { return last_lsn_ >= end_lsn_; } -string LogFileWriter::to_string() const -{ - return filename_; -} +string LogFileWriter::to_string() const { return filename_; } //////////////////////////////////////////////////////////////////////////////// // LogFileManager RC LogFileManager::init(const char *directory, int max_entry_number_per_file) { - directory_ = filesystem::absolute(filesystem::path(directory)); + directory_ = filesystem::absolute(filesystem::path(directory)); max_entry_number_per_file_ = max_entry_number_per_file; // 检查目录是否存在，不存在就创建出来 @@ -244,7 +232,7 @@ RC LogFileManager::init(const char *directory, int max_entry_number_per_file) LOG_INFO("directory is not exist. directory=%s", directory_.c_str()); error_code ec; - bool ret = filesystem::create_directories(directory_, ec); + bool ret = filesystem::create_directories(directory_, ec); if (!ret) { LOG_WARN("create directory failed. directory=%s, error=%s", directory_.c_str(), ec.message().c_str()); return RC::FILE_CREATE; @@ -258,8 +246,8 @@ RC LogFileManager::init(const char *directory, int max_entry_number_per_file) } string filename = dir_entry.path().filename().string(); - LSN lsn = 0; - RC rc = get_lsn_from_filename(filename, lsn); + LSN lsn = 0; + RC rc = get_lsn_from_filename(filename, lsn); if (OB_FAIL(rc)) { LOG_TRACE("invalid log file name. filename=%s", filename.c_str()); continue; @@ -285,7 +273,8 @@ RC LogFileManager::get_lsn_from_filename(const string &filename, LSN &lsn) return RC::INVALID_ARGUMENT; } - string_view lsn_str(filename.data() + strlen(file_prefix_), filename.length() - strlen(file_suffix_) - strlen(file_prefix_)); + string_view lsn_str( + filename.data() + strlen(file_prefix_), filename.length() - strlen(file_suffix_) - strlen(file_prefix_)); from_chars_result result = from_chars(lsn_str.data(), lsn_str.data() + lsn_str.size(), lsn); if (result.ec != errc()) { LOG_TRACE("invalid log file name: cannot calc lsn. filename=%s, error=%s", @@ -320,8 +309,7 @@ RC LogFileManager::last_file(LogFileWriter &file_writer) file_writer.close(); auto last_file_item = log_files_.rbegin(); - return file_writer.open(last_file_item->second.c_str(), - last_file_item->first + max_entry_number_per_file_ - 1); + return file_writer.open(last_file_item->second.c_str(), last_file_item->first + max_entry_number_per_file_ - 1); } RC LogFileManager::next_file(LogFileWriter &file_writer) @@ -333,10 +321,10 @@ RC LogFileManager::next_file(LogFileWriter &file_writer) lsn = log_files_.rbegin()->first + max_entry_number_per_file_; } - string filename = file_prefix_ + to_string(lsn) + file_suffix_; + string filename = file_prefix_ + to_string(lsn) + file_suffix_; filesystem::path file_path = directory_ / filename; log_files_.emplace(lsn, file_path); return file_writer.open(file_path.c_str(), lsn + max_entry_number_per_file_ - 1); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/clog/log_file.h b/src/observer/storage/clog/log_file.h index 4ea268475..77a107074 100644 --- a/src/observer/storage/clog/log_file.h +++ b/src/observer/storage/clog/log_file.h @@ -155,4 +155,4 @@ class LogFileManager map log_files_; /// 日志文件名和第一个LSN的映射 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/clog/log_handler.cpp b/src/observer/storage/clog/log_handler.cpp index d9dd2fe05..0770e2a74 100644 --- a/src/observer/storage/clog/log_handler.cpp +++ b/src/observer/storage/clog/log_handler.cpp @@ -47,4 +47,4 @@ RC LogHandler::create(const char *name, LogHandler *&log_handler) } return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/clog/log_handler.h b/src/observer/storage/clog/log_handler.h index 8e9fb862b..20a59ff6a 100644 --- a/src/observer/storage/clog/log_handler.h +++ b/src/observer/storage/clog/log_handler.h @@ -107,4 +107,4 @@ class LogHandler */ virtual RC _append(LSN &lsn, LogModule module, vector &&data) = 0; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/clog/log_module.h b/src/observer/storage/clog/log_module.h index c357c3981..e01ebeab6 100644 --- a/src/observer/storage/clog/log_module.h +++ b/src/observer/storage/clog/log_module.h @@ -54,4 +54,4 @@ class LogModule private: Id id_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/clog/log_replayer.h b/src/observer/storage/clog/log_replayer.h index 403d1cd94..57e83a714 100644 --- a/src/observer/storage/clog/log_replayer.h +++ b/src/observer/storage/clog/log_replayer.h @@ -42,4 +42,4 @@ class LogReplayer */ virtual RC on_done() { return RC::SUCCESS; } }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/clog/vacuous_log_handler.h b/src/observer/storage/clog/vacuous_log_handler.h index 1c31db71d..567234513 100644 --- a/src/observer/storage/clog/vacuous_log_handler.h +++ b/src/observer/storage/clog/vacuous_log_handler.h @@ -47,4 +47,4 @@ class VacuousLogHandler : public LogHandler return RC::SUCCESS; } }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/common/arena_allocator.cpp b/src/observer/storage/common/arena_allocator.cpp index a55688378..36643304a 100644 --- a/src/observer/storage/common/arena_allocator.cpp +++ b/src/observer/storage/common/arena_allocator.cpp @@ -18,41 +18,42 @@ namespace oceanbase { static const int kBlockSize = 4096; -Arena::Arena() - : alloc_ptr_(nullptr), alloc_bytes_remaining_(0), memory_usage_(0) {} +Arena::Arena() : alloc_ptr_(nullptr), alloc_bytes_remaining_(0), memory_usage_(0) {} -Arena::~Arena() { +Arena::~Arena() +{ for (size_t i = 0; i < blocks_.size(); i++) { delete[] blocks_[i]; } } -char* Arena::AllocateFallback(size_t bytes) { +char *Arena::AllocateFallback(size_t bytes) +{ if (bytes > kBlockSize / 4) { // Object is more than a quarter of our block size. Allocate it separately // to avoid wasting too much space in leftover bytes. - char* result = AllocateNewBlock(bytes); + char *result = AllocateNewBlock(bytes); return result; } // We waste the remaining space in the current block. - alloc_ptr_ = AllocateNewBlock(kBlockSize); + alloc_ptr_ = AllocateNewBlock(kBlockSize); alloc_bytes_remaining_ = kBlockSize; - char* result = alloc_ptr_; + char *result = alloc_ptr_; alloc_ptr_ += bytes; alloc_bytes_remaining_ -= bytes; return result; } -char* Arena::AllocateAligned(size_t bytes) { - const int align = (sizeof(void*) > 8) ? sizeof(void*) : 8; - static_assert((align & (align - 1)) == 0, - "Pointer size should be a power of 2"); +char *Arena::AllocateAligned(size_t bytes) +{ + const int align = (sizeof(void *) > 8) ? sizeof(void *) : 8; + static_assert((align & (align - 1)) == 0, "Pointer size should be a power of 2"); size_t current_mod = reinterpret_cast(alloc_ptr_) & (align - 1); - size_t slop = (current_mod == 0 ? 0 : align - current_mod); - size_t needed = bytes + slop; - char* result; + size_t slop = (current_mod == 0 ? 0 : align - current_mod); + size_t needed = bytes + slop; + char *result; if (needed <= alloc_bytes_remaining_) { result = alloc_ptr_ + slop; alloc_ptr_ += needed; @@ -65,11 +66,11 @@ char* Arena::AllocateAligned(size_t bytes) { return result; } -char* Arena::AllocateNewBlock(size_t block_bytes) { - char* result = new char[block_bytes]; +char *Arena::AllocateNewBlock(size_t block_bytes) +{ + char *result = new char[block_bytes]; blocks_.push_back(result); - memory_usage_.fetch_add(block_bytes + sizeof(char*), - std::memory_order_relaxed); + memory_usage_.fetch_add(block_bytes + sizeof(char *), std::memory_order_relaxed); return result; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/common/arena_allocator.h b/src/observer/storage/common/arena_allocator.h index 6e43926bb..f405e66db 100644 --- a/src/observer/storage/common/arena_allocator.h +++ b/src/observer/storage/common/arena_allocator.h @@ -74,4 +74,4 @@ inline char *Arena::Allocate(size_t bytes) } return AllocateFallback(bytes); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/common/chunk.cpp b/src/observer/storage/common/chunk.cpp index 858f0cfe8..30a02a14f 100644 --- a/src/observer/storage/common/chunk.cpp +++ b/src/observer/storage/common/chunk.cpp @@ -60,4 +60,4 @@ void Chunk::reset() columns_.clear(); column_ids_.clear(); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/common/chunk.h b/src/observer/storage/common/chunk.h index 0b85714a9..544985a7b 100644 --- a/src/observer/storage/common/chunk.h +++ b/src/observer/storage/common/chunk.h @@ -102,4 +102,4 @@ class Chunk // `columnd_ids` store the ids of child operator that need to be output vector column_ids_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/common/codec.cpp b/src/observer/storage/common/codec.cpp index de09dc2ab..093373c87 100644 --- a/src/observer/storage/common/codec.cpp +++ b/src/observer/storage/common/codec.cpp @@ -10,8 +10,8 @@ See the Mulan PSL v2 for more details. */ #include "storage/common/codec.h" -const byte_t OrderedCode::term[] = {0x00, 0x01}; +const byte_t OrderedCode::term[] = {0x00, 0x01}; const byte_t OrderedCode::lit00[] = {0x00, 0xff}; const byte_t OrderedCode::litff[] = {0xff, 0x00}; -const byte_t OrderedCode::inf[] = {0xff, 0xff}; -const byte_t OrderedCode::msb[] = {0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe}; +const byte_t OrderedCode::inf[] = {0xff, 0xff}; +const byte_t OrderedCode::msb[] = {0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe}; diff --git a/src/observer/storage/common/codec.h b/src/observer/storage/common/codec.h index a1f8fcd30..e1261b67d 100644 --- a/src/observer/storage/common/codec.h +++ b/src/observer/storage/common/codec.h @@ -505,4 +505,4 @@ class Codec // } // return rc; // } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/common/column.cpp b/src/observer/storage/common/column.cpp index 0a91ef3d8..9acc66eb5 100644 --- a/src/observer/storage/common/column.cpp +++ b/src/observer/storage/common/column.cpp @@ -23,16 +23,16 @@ Column::Column(const FieldMeta &meta, size_t size) column_type_(Type::NORMAL_COLUMN) { // TODO: optimized the memory usage if it doesn't need to allocate memory - data_ = new char[size * attr_len_]; + data_ = new char[size * attr_len_]; memset(data_, 0, size * attr_len_); capacity_ = size; } Column::Column(AttrType attr_type, int attr_len, size_t capacity) { - attr_type_ = attr_type; - attr_len_ = attr_len; - data_ = new char[capacity * attr_len_]; + attr_type_ = attr_type; + attr_len_ = attr_len; + data_ = new char[capacity * attr_len_]; memset(data_, 0, capacity * attr_len_); count_ = 0; capacity_ = capacity; @@ -43,7 +43,7 @@ Column::Column(AttrType attr_type, int attr_len, size_t capacity) void Column::init(const FieldMeta &meta, size_t size) { reset(); - data_ = new char[size * meta.len()]; + data_ = new char[size * meta.len()]; memset(data_, 0, size * meta.len()); count_ = 0; capacity_ = size; @@ -56,7 +56,7 @@ void Column::init(const FieldMeta &meta, size_t size) void Column::init(AttrType attr_type, int attr_len, size_t capacity) { reset(); - data_ = new char[capacity * attr_len]; + data_ = new char[capacity * attr_len]; memset(data_, 0, capacity * attr_len); count_ = 0; capacity_ = capacity; @@ -72,14 +72,14 @@ void Column::init(const Value &value, size_t size) attr_type_ = value.attr_type(); attr_len_ = value.length(); if (attr_len_ == 0) { - data_ = new char[1]; + data_ = new char[1]; data_[0] = '\0'; } else { - data_ = new char[attr_len_]; + data_ = new char[attr_len_]; } - count_ = size; - capacity_ = 1; - own_ = true; + count_ = size; + capacity_ = 1; + own_ = true; memcpy(data_, value.data(), attr_len_); column_type_ = Type::CONSTANT_COLUMN; } @@ -151,7 +151,7 @@ string_t Column::add_text(const char *data, int length) Value Column::get_value(int index) const { if (column_type_ == Type::CONSTANT_COLUMN) { - index = 0; + index = 0; } if (index >= count_ || index < 0) { return Value(); @@ -175,4 +175,4 @@ void Column::reference(const Column &column) this->attr_type_ = column.attr_type(); this->attr_len_ = column.attr_len(); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/common/column.h b/src/observer/storage/common/column.h index 372aa26c9..51b6e99ce 100644 --- a/src/observer/storage/common/column.h +++ b/src/observer/storage/common/column.h @@ -145,4 +145,4 @@ class Column Type column_type_ = Type::NORMAL_COLUMN; unique_ptr vector_buffer_ = nullptr; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/common/condition_filter.cpp b/src/observer/storage/common/condition_filter.cpp index 9e415ebd9..2d1bb8d5e 100644 --- a/src/observer/storage/common/condition_filter.cpp +++ b/src/observer/storage/common/condition_filter.cpp @@ -213,4 +213,4 @@ bool CompositeConditionFilter::filter(const Record &rec) const } return true; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/common/condition_filter.h b/src/observer/storage/common/condition_filter.h index 993fd808b..e31d90dc6 100644 --- a/src/observer/storage/common/condition_filter.h +++ b/src/observer/storage/common/condition_filter.h @@ -90,4 +90,4 @@ class CompositeConditionFilter : public ConditionFilter int filter_num_ = 0; bool memory_owner_ = false; // filters_的内存是否由自己来控制 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/common/meta_util.cpp b/src/observer/storage/common/meta_util.cpp index 35f03396a..5ad35da22 100644 --- a/src/observer/storage/common/meta_util.cpp +++ b/src/observer/storage/common/meta_util.cpp @@ -41,4 +41,4 @@ string table_lob_file(const char *base_dir, const char *table_name) { return filesystem::path(base_dir) / (string(table_name) + TABLE_LOB_SUFFIX); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/common/meta_util.h b/src/observer/storage/common/meta_util.h index 719437792..e41c46700 100644 --- a/src/observer/storage/common/meta_util.h +++ b/src/observer/storage/common/meta_util.h @@ -29,4 +29,4 @@ string table_meta_file(const char *base_dir, const char *table_name); string table_data_file(const char *base_dir, const char *table_name); string table_index_file(const char *base_dir, const char *table_name, const char *index_name); string table_lob_file(const char *base_dir, const char *table_name); -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/common/vector_buffer.h b/src/observer/storage/common/vector_buffer.h index 618c8c745..a7987ea18 100644 --- a/src/observer/storage/common/vector_buffer.h +++ b/src/observer/storage/common/vector_buffer.h @@ -34,4 +34,4 @@ class VectorBuffer private: Arena heap; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/db/db.cpp b/src/observer/storage/db/db.cpp index ed0f85b9f..0180598c1 100644 --- a/src/observer/storage/db/db.cpp +++ b/src/observer/storage/db/db.cpp @@ -51,7 +51,8 @@ Db::~Db() LOG_INFO("Db has been closed: %s", name_.c_str()); } -RC Db::init(const char *name, const char *dbpath, const char *trx_kit_name, const char *log_handler_name, const char *storage_engine) +RC Db::init(const char *name, const char *dbpath, const char *trx_kit_name, const char *log_handler_name, + const char *storage_engine) { RC rc = RC::SUCCESS; @@ -66,7 +67,7 @@ RC Db::init(const char *name, const char *dbpath, const char *trx_kit_name, cons } oceanbase::ObLsmOptions options; - filesystem::path lsm_path = filesystem::path(dbpath) / "lsm"; + filesystem::path lsm_path = filesystem::path(dbpath) / "lsm"; filesystem::create_directory(lsm_path); rc = oceanbase::ObLsm::open(options, lsm_path, &lsm_); @@ -152,7 +153,8 @@ RC Db::init(const char *name, const char *dbpath, const char *trx_kit_name, cons return rc; } -RC Db::create_table(const char *table_name, span attributes, const vector& primary_keys, const StorageFormat storage_format) +RC Db::create_table(const char *table_name, span attributes, const vector &primary_keys, + const StorageFormat storage_format) { RC rc = RC::SUCCESS; // check table_name @@ -165,8 +167,15 @@ RC Db::create_table(const char *table_name, span attribut string table_file_path = table_meta_file(path_.c_str(), table_name); Table *table = new Table(); int32_t table_id = next_table_id_++; - rc = table->create(this, table_id, table_file_path.c_str(), table_name, path_.c_str(), attributes, primary_keys, storage_format, - get_storage_engine()); + rc = table->create(this, + table_id, + table_file_path.c_str(), + table_name, + path_.c_str(), + attributes, + primary_keys, + storage_format, + get_storage_engine()); if (rc != RC::SUCCESS) { LOG_ERROR("Failed to create table %s.", table_name); delete table; @@ -417,4 +426,4 @@ RC Db::init_dblwr_buffer() LogHandler &Db::log_handler() { return *log_handler_; } BufferPoolManager &Db::buffer_pool_manager() { return *buffer_pool_manager_; } TrxKit &Db::trx_kit() { return *trx_kit_; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/db/db.h b/src/observer/storage/db/db.h index 2906c5cd6..7cad886d1 100644 --- a/src/observer/storage/db/db.h +++ b/src/observer/storage/db/db.h @@ -150,4 +150,4 @@ class Db LSN check_point_lsn_ = 0; ///< 当前数据库的检查点LSN。会记录到磁盘中。 string storage_engine_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/default/default_handler.cpp b/src/observer/storage/default/default_handler.cpp index e5b095b7b..7a513f34b 100644 --- a/src/observer/storage/default/default_handler.cpp +++ b/src/observer/storage/default/default_handler.cpp @@ -32,7 +32,8 @@ DefaultHandler::DefaultHandler() {} DefaultHandler::~DefaultHandler() noexcept { destroy(); } -RC DefaultHandler::init(const char *base_dir, const char *trx_kit_name, const char *log_handler_name, const char *storage_engine) +RC DefaultHandler::init( + const char *base_dir, const char *trx_kit_name, const char *log_handler_name, const char *storage_engine) { // 检查目录是否存在，或者创建 filesystem::path db_dir(base_dir); @@ -43,11 +44,11 @@ RC DefaultHandler::init(const char *base_dir, const char *trx_kit_name, const ch return RC::INTERNAL; } - base_dir_ = base_dir; - db_dir_ = db_dir; - trx_kit_name_ = trx_kit_name; + base_dir_ = base_dir; + db_dir_ = db_dir; + trx_kit_name_ = trx_kit_name; log_handler_name_ = log_handler_name; - storage_engine_ = storage_engine; + storage_engine_ = storage_engine; const char *sys_db = "sys"; @@ -123,7 +124,9 @@ RC DefaultHandler::open_db(const char *dbname) // open db Db *db = new Db(); RC ret = RC::SUCCESS; - if ((ret = db->init(dbname, dbpath.c_str(), trx_kit_name_.c_str(), log_handler_name_.c_str(), storage_engine_.c_str())) != RC::SUCCESS) { + if ((ret = db->init( + dbname, dbpath.c_str(), trx_kit_name_.c_str(), log_handler_name_.c_str(), storage_engine_.c_str())) != + RC::SUCCESS) { LOG_ERROR("Failed to open db: %s. error=%s", dbname, strrc(ret)); delete db; } else { @@ -182,4 +185,4 @@ RC DefaultHandler::sync() } return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/default/default_handler.h b/src/observer/storage/default/default_handler.h index 130f3f1a8..cb129bac9 100644 --- a/src/observer/storage/default/default_handler.h +++ b/src/observer/storage/default/default_handler.h @@ -100,4 +100,4 @@ class DefaultHandler map opened_dbs_; ///< 打开的数据库 string storage_engine_; ///< 存储引擎的名称 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/field/field.cpp b/src/observer/storage/field/field.cpp index 5b4534ed2..934a05eff 100644 --- a/src/observer/storage/field/field.cpp +++ b/src/observer/storage/field/field.cpp @@ -35,4 +35,4 @@ int Field::get_int(const Record &record) } const char *Field::get_data(const Record &record) { return record.data() + field_->offset(); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/field/field.h b/src/observer/storage/field/field.h index ba587f1c7..ed279e375 100644 --- a/src/observer/storage/field/field.h +++ b/src/observer/storage/field/field.h @@ -50,4 +50,4 @@ class Field const Table *table_ = nullptr; const FieldMeta *field_ = nullptr; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/field/field_meta.cpp b/src/observer/storage/field/field_meta.cpp index b42a9db1e..2b509b0eb 100644 --- a/src/observer/storage/field/field_meta.cpp +++ b/src/observer/storage/field/field_meta.cpp @@ -28,7 +28,8 @@ const static Json::StaticString FIELD_LEN("len"); const static Json::StaticString FIELD_VISIBLE("visible"); const static Json::StaticString FIELD_FIELD_ID("FIELD_id"); -FieldMeta::FieldMeta() : attr_type_(AttrType::UNDEFINED), attr_offset_(-1), attr_len_(0), visible_(false), field_id_(0) {} +FieldMeta::FieldMeta() : attr_type_(AttrType::UNDEFINED), attr_offset_(-1), attr_len_(0), visible_(false), field_id_(0) +{} FieldMeta::FieldMeta(const char *name, AttrType attr_type, int attr_offset, int attr_len, bool visible, int field_id) { @@ -54,7 +55,7 @@ RC FieldMeta::init(const char *name, AttrType attr_type, int attr_offset, int at attr_len_ = attr_len; attr_offset_ = attr_offset; visible_ = visible; - field_id_ = field_id; + field_id_ = field_id; LOG_INFO("Init a field with name=%s", name); return RC::SUCCESS; @@ -80,11 +81,11 @@ void FieldMeta::desc(ostream &os) const void FieldMeta::to_json(Json::Value &json_value) const { - json_value[FIELD_NAME] = name_; - json_value[FIELD_TYPE] = attr_type_to_string(attr_type_); - json_value[FIELD_OFFSET] = attr_offset_; - json_value[FIELD_LEN] = attr_len_; - json_value[FIELD_VISIBLE] = visible_; + json_value[FIELD_NAME] = name_; + json_value[FIELD_TYPE] = attr_type_to_string(attr_type_); + json_value[FIELD_OFFSET] = attr_offset_; + json_value[FIELD_LEN] = attr_len_; + json_value[FIELD_VISIBLE] = visible_; json_value[FIELD_FIELD_ID] = field_id_; } @@ -95,11 +96,11 @@ RC FieldMeta::from_json(const Json::Value &json_value, FieldMeta &field) return RC::INTERNAL; } - const Json::Value &name_value = json_value[FIELD_NAME]; - const Json::Value &type_value = json_value[FIELD_TYPE]; - const Json::Value &offset_value = json_value[FIELD_OFFSET]; - const Json::Value &len_value = json_value[FIELD_LEN]; - const Json::Value &visible_value = json_value[FIELD_VISIBLE]; + const Json::Value &name_value = json_value[FIELD_NAME]; + const Json::Value &type_value = json_value[FIELD_TYPE]; + const Json::Value &offset_value = json_value[FIELD_OFFSET]; + const Json::Value &len_value = json_value[FIELD_LEN]; + const Json::Value &visible_value = json_value[FIELD_VISIBLE]; const Json::Value &field_id_value = json_value[FIELD_FIELD_ID]; if (!name_value.isString()) { @@ -134,11 +135,11 @@ RC FieldMeta::from_json(const Json::Value &json_value, FieldMeta &field) return RC::INTERNAL; } - const char *name = name_value.asCString(); - int offset = offset_value.asInt(); - int len = len_value.asInt(); - bool visible = visible_value.asBool(); - int field_id = field_id_value.asInt(); + const char *name = name_value.asCString(); + int offset = offset_value.asInt(); + int len = len_value.asInt(); + bool visible = visible_value.asBool(); + int field_id = field_id_value.asInt(); return field.init(name, type, offset, len, visible, field_id); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/field/field_meta.h b/src/observer/storage/field/field_meta.h index 50245997b..7b4249f48 100644 --- a/src/observer/storage/field/field_meta.h +++ b/src/observer/storage/field/field_meta.h @@ -60,4 +60,4 @@ class FieldMeta bool visible_; int field_id_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/index/bplus_tree.cpp b/src/observer/storage/index/bplus_tree.cpp index cae7500b8..7acb6d8fa 100644 --- a/src/observer/storage/index/bplus_tree.cpp +++ b/src/observer/storage/index/bplus_tree.cpp @@ -79,15 +79,12 @@ int IndexNodeHandler::min_size() const return max - max / 2; } -void IndexNodeHandler::increase_size(int n) -{ - node_->key_num += n; -} +void IndexNodeHandler::increase_size(int n) { node_->key_num += n; } PageNum IndexNodeHandler::parent_page_num() const { return node_->parent; } -RC IndexNodeHandler::set_parent_page_num(PageNum page_num) -{ +RC IndexNodeHandler::set_parent_page_num(PageNum page_num) +{ RC rc = mtr_.logger().set_parent_page(*this, page_num, this->node_->parent); if (OB_FAIL(rc)) { LOG_WARN("failed to log set parent page. rc=%s", strrc(rc)); @@ -194,20 +191,20 @@ RC LeafIndexNodeHandler::init_empty() LOG_WARN("failed to log init empty leaf node. rc=%s", strrc(rc)); return rc; } - IndexNodeHandler::init_empty(true/*leaf*/); + IndexNodeHandler::init_empty(true /*leaf*/); leaf_node_->next_brother = BP_INVALID_PAGE_NUM; return RC::SUCCESS; } -RC LeafIndexNodeHandler::set_next_page(PageNum page_num) -{ +RC LeafIndexNodeHandler::set_next_page(PageNum page_num) +{ RC rc = mtr_.logger().leaf_set_next_page(*this, page_num, leaf_node_->next_brother); if (OB_FAIL(rc)) { LOG_WARN("failed to log set next page. rc=%s", strrc(rc)); return rc; } - leaf_node_->next_brother = page_num; + leaf_node_->next_brother = page_num; return RC::SUCCESS; } @@ -277,13 +274,16 @@ int LeafIndexNodeHandler::remove(const char *key, const KeyComparator &comparato RC LeafIndexNodeHandler::move_half_to(LeafIndexNodeHandler &other) { - const int size = this->size(); - const int move_index = size / 2; + const int size = this->size(); + const int move_index = size / 2; const int move_item_num = size - move_index; other.append(__item_at(move_index), move_item_num); - RC rc = mtr_.logger().node_remove_items(*this, move_index, span(__item_at(move_index), static_cast(move_item_num) * item_size()), move_item_num); + RC rc = mtr_.logger().node_remove_items(*this, + move_index, + span(__item_at(move_index), static_cast(move_item_num) * item_size()), + move_item_num); if (OB_FAIL(rc)) { LOG_WARN("failed to log shrink leaf node. rc=%s", strrc(rc)); return rc; @@ -314,7 +314,10 @@ RC LeafIndexNodeHandler::move_to(LeafIndexNodeHandler &other) other.append(__item_at(0), this->size()); other.set_next_page(this->next_page()); - RC rc = mtr_.logger().node_remove_items(*this, 0, span(__item_at(0), static_cast(this->size()) * static_cast(item_size())), this->size()); + RC rc = mtr_.logger().node_remove_items(*this, + 0, + span(__item_at(0), static_cast(this->size()) * static_cast(item_size())), + this->size()); if (OB_FAIL(rc)) { LOG_WARN("failed to log shrink leaf node. rc=%s", strrc(rc)); @@ -327,7 +330,8 @@ RC LeafIndexNodeHandler::move_to(LeafIndexNodeHandler &other) // 复制一些数据到当前节点的最右边 RC LeafIndexNodeHandler::append(const char *items, int num) { - RC rc = mtr_.logger().node_insert_items(*this, size(), span(items, static_cast(num) * static_cast(item_size())), num); + RC rc = mtr_.logger().node_insert_items( + *this, size(), span(items, static_cast(num) * static_cast(item_size())), num); if (OB_FAIL(rc)) { LOG_WARN("failed to log append items. rc=%d:%s", rc, strrc(rc)); return rc; @@ -336,15 +340,9 @@ RC LeafIndexNodeHandler::append(const char *items, int num) return recover_insert_items(size(), items, num); } -RC LeafIndexNodeHandler::append(const char *item) -{ - return append(item, 1); -} +RC LeafIndexNodeHandler::append(const char *item) { return append(item, 1); } -RC LeafIndexNodeHandler::preappend(const char *item) -{ - return insert(0, item, item + key_size()); -} +RC LeafIndexNodeHandler::preappend(const char *item) { return insert(0, item, item + key_size()); } char *LeafIndexNodeHandler::__item_at(int index) const { return leaf_node_->array + (index * item_size()); } @@ -382,7 +380,7 @@ bool LeafIndexNodeHandler::validate(const KeyComparator &comparator, DiskBufferP } Frame *parent_frame = nullptr; - RC rc = bp->get_this_page(parent_page_num, &parent_frame); + RC rc = bp->get_this_page(parent_page_num, &parent_frame); if (OB_FAIL(rc)) { LOG_WARN("failed to fetch parent page. page num=%d, rc=%d:%s", parent_page_num, rc, strrc(rc)); return false; @@ -423,7 +421,8 @@ bool LeafIndexNodeHandler::validate(const KeyComparator &comparator, DiskBufferP } ///////////////////////////////////////////////////////////////////////////////// -InternalIndexNodeHandler::InternalIndexNodeHandler(BplusTreeMiniTransaction &mtr, const IndexFileHeader &header, Frame *frame) +InternalIndexNodeHandler::InternalIndexNodeHandler( + BplusTreeMiniTransaction &mtr, const IndexFileHeader &header, Frame *frame) : IndexNodeHandler(mtr, header, frame), internal_node_((InternalIndexNode *)frame->data()) {} @@ -442,13 +441,13 @@ string to_string(const InternalIndexNodeHandler &node, const KeyPrinter &printer return ss.str(); } -RC InternalIndexNodeHandler::init_empty() +RC InternalIndexNodeHandler::init_empty() { RC rc = mtr_.logger().internal_init_empty(*this); if (OB_FAIL(rc)) { LOG_WARN("failed to log init empty internal node. rc=%s", strrc(rc)); } - IndexNodeHandler::init_empty(false/*leaf*/); + IndexNodeHandler::init_empty(false /*leaf*/); return RC::SUCCESS; } RC InternalIndexNodeHandler::create_new_root(PageNum first_page_num, const char *key, PageNum page_num) @@ -503,7 +502,8 @@ RC InternalIndexNodeHandler::move_half_to(InternalIndexNodeHandler &other) return rc; } - mtr_.logger().node_remove_items(*this, move_index, span(__item_at(move_index), move_num * item_size()), move_num); + mtr_.logger().node_remove_items( + *this, move_index, span(__item_at(move_index), move_num * item_size()), move_num); increase_size(-(size - move_index)); return rc; } @@ -551,7 +551,8 @@ void InternalIndexNodeHandler::set_key_at(int index, const char *key) { assert(index >= 0 && index < size()); - mtr_.logger().internal_update_key(*this, index, span(key, key_size()), span(__key_at(index), key_size())); + mtr_.logger().internal_update_key( + *this, index, span(key, key_size()), span(__key_at(index), key_size())); memcpy(__key_at(index), key, key_size()); } @@ -576,7 +577,7 @@ void InternalIndexNodeHandler::remove(int index) assert(index >= 0 && index < size()); BplusTreeLogger &logger = mtr_.logger(); - RC rc = logger.node_remove_items(*this, index, span(__item_at(index), item_size()), 1); + RC rc = logger.node_remove_items(*this, index, span(__item_at(index), item_size()), 1); if (OB_FAIL(rc)) { LOG_WARN("failed to log remove item. rc=%s. node=%s", strrc(rc), to_string(*this).c_str()); } @@ -632,7 +633,8 @@ RC InternalIndexNodeHandler::move_last_to_front(InternalIndexNodeHandler &other) RC InternalIndexNodeHandler::insert_items(int index, const char *items, int num) { - RC rc = mtr_.logger().node_insert_items(*this, index, span(items, static_cast(item_size()) * static_cast(num)), num); + RC rc = mtr_.logger().node_insert_items( + *this, index, span(items, static_cast(item_size()) * static_cast(num)), num); if (OB_FAIL(rc)) { LOG_WARN("failed to log insert item. rc=%s", strrc(rc)); return rc; @@ -640,22 +642,22 @@ RC InternalIndexNodeHandler::insert_items(int index, const char *items, int num) recover_insert_items(index, items, num); - LatchMemo &latch_memo = mtr_.latch_memo(); - PageNum this_page_num = this->page_num(); - Frame *frame = nullptr; + LatchMemo &latch_memo = mtr_.latch_memo(); + PageNum this_page_num = this->page_num(); + Frame *frame = nullptr; // 设置所有页面的父页面为当前页面 // 这里会访问大量的页面，可能会将他们从磁盘加载到内存中而占用大量的buffer pool页面 for (int i = 0; i < num; i++) { const PageNum page_num = *(const PageNum *)((items + i * item_size()) + key_size()); - rc = latch_memo.get_page(page_num, frame); + rc = latch_memo.get_page(page_num, frame); if (OB_FAIL(rc)) { LOG_WARN("failed to set child's page num. child page num:%d, this page num=%d, rc=%d:%s", page_num, this_page_num, rc, strrc(rc)); return rc; } IndexNodeHandler child_node(mtr_, header_, frame); - child_node.set_parent_page_num(this_page_num); // 这里虽然对页面做了修改，但是并没有加写锁，因为父页面加了锁 + child_node.set_parent_page_num(this_page_num); // 这里虽然对页面做了修改，但是并没有加写锁，因为父页面加了锁 frame->mark_dirty(); } @@ -665,17 +667,11 @@ RC InternalIndexNodeHandler::insert_items(int index, const char *items, int num) /** * copy items from other node to self's right */ -RC InternalIndexNodeHandler::append(const char *items, int num) -{ - return insert_items(size(), items, num); -} +RC InternalIndexNodeHandler::append(const char *items, int num) { return insert_items(size(), items, num); } RC InternalIndexNodeHandler::append(const char *item) { return this->append(item, 1); } -RC InternalIndexNodeHandler::preappend(const char *item) -{ - return this->insert_items(0, item, 1); -} +RC InternalIndexNodeHandler::preappend(const char *item) { return this->insert_items(0, item, 1); } char *InternalIndexNodeHandler::__item_at(int index) const { return internal_node_->array + (index * item_size()); } @@ -705,7 +701,7 @@ bool InternalIndexNodeHandler::validate(const KeyComparator &comparator, DiskBuf LOG_WARN("this page num=%d, got invalid child page. page num=%d", this->page_num(), page_num); } else { Frame *child_frame = nullptr; - RC rc = bp->get_this_page(page_num, &child_frame); + RC rc = bp->get_this_page(page_num, &child_frame); if (OB_FAIL(rc)) { LOG_WARN("failed to fetch child page while validate internal page. page num=%d, rc=%d:%s", page_num, rc, strrc(rc)); @@ -731,7 +727,7 @@ bool InternalIndexNodeHandler::validate(const KeyComparator &comparator, DiskBuf } Frame *parent_frame = nullptr; - RC rc = bp->get_this_page(parent_page_num, &parent_frame); + RC rc = bp->get_this_page(parent_page_num, &parent_frame); if (OB_FAIL(rc)) { LOG_WARN("failed to fetch parent page. page num=%d, rc=%d:%s", parent_page_num, rc, strrc(rc)); return false; @@ -795,13 +791,8 @@ RC BplusTreeHandler::sync() return disk_buffer_pool_->flush_all_pages(); } -RC BplusTreeHandler::create(LogHandler &log_handler, - BufferPoolManager &bpm, - const char *file_name, - AttrType attr_type, - int attr_length, - int internal_max_size /* = -1*/, - int leaf_max_size /* = -1 */) +RC BplusTreeHandler::create(LogHandler &log_handler, BufferPoolManager &bpm, const char *file_name, AttrType attr_type, + int attr_length, int internal_max_size /* = -1*/, int leaf_max_size /* = -1 */) { RC rc = bpm.create_file(file_name); if (OB_FAIL(rc)) { @@ -829,12 +820,8 @@ RC BplusTreeHandler::create(LogHandler &log_handler, return rc; } -RC BplusTreeHandler::create(LogHandler &log_handler, - DiskBufferPool &buffer_pool, - AttrType attr_type, - int attr_length, - int internal_max_size /* = -1 */, - int leaf_max_size /* = -1 */) +RC BplusTreeHandler::create(LogHandler &log_handler, DiskBufferPool &buffer_pool, AttrType attr_type, int attr_length, + int internal_max_size /* = -1 */, int leaf_max_size /* = -1 */) { if (internal_max_size < 0) { internal_max_size = calc_internal_page_capacity(attr_length); @@ -913,7 +900,7 @@ RC BplusTreeHandler::open(LogHandler &log_handler, BufferPoolManager &bpm, const return RC::RECORD_OPENNED; } - DiskBufferPool *disk_buffer_pool = nullptr; + DiskBufferPool *disk_buffer_pool = nullptr; RC rc = bpm.open_file(log_handler, file_name, disk_buffer_pool); if (OB_FAIL(rc)) { @@ -979,7 +966,7 @@ RC BplusTreeHandler::close() RC BplusTreeHandler::print_leaf(Frame *frame) { BplusTreeMiniTransaction mtr(*this); - LeafIndexNodeHandler leaf_node(mtr, file_header_, frame); + LeafIndexNodeHandler leaf_node(mtr, file_header_, frame); LOG_INFO("leaf node: %s", to_string(leaf_node, key_printer_).c_str()); disk_buffer_pool_->unpin_page(frame); return RC::SUCCESS; @@ -987,7 +974,7 @@ RC BplusTreeHandler::print_leaf(Frame *frame) RC BplusTreeHandler::print_internal_node_recursive(Frame *frame) { - RC rc = RC::SUCCESS; + RC rc = RC::SUCCESS; BplusTreeMiniTransaction mtr(*this); LOG_INFO("bplus tree. file header: %s", file_header_.to_string().c_str()); @@ -1061,8 +1048,8 @@ RC BplusTreeHandler::print_leafs() } BplusTreeMiniTransaction mtr(*this); - LatchMemo latch_memo = mtr.latch_memo(); - Frame *frame = nullptr; + LatchMemo latch_memo = mtr.latch_memo(); + Frame *frame = nullptr; RC rc = left_most_page(mtr, frame); if (OB_FAIL(rc)) { @@ -1101,9 +1088,9 @@ bool BplusTreeHandler::validate_node_recursive(BplusTreeMiniTransaction &mtr, Fr InternalIndexNodeHandler internal_node(mtr, file_header_, frame); result = internal_node.validate(key_comparator_, disk_buffer_pool_); for (int i = 0; result && i < internal_node.size(); i++) { - PageNum page_num = internal_node.value_at(i); + PageNum page_num = internal_node.value_at(i); Frame *child_frame = nullptr; - RC rc = mtr.latch_memo().get_page(page_num, child_frame); + RC rc = mtr.latch_memo().get_page(page_num, child_frame); if (OB_FAIL(rc)) { LOG_WARN("failed to fetch child page.page id=%d, rc=%d:%s", page_num, rc, strrc(rc)); result = false; @@ -1166,8 +1153,8 @@ bool BplusTreeHandler::validate_tree() } BplusTreeMiniTransaction mtr(*this); - LatchMemo &latch_memo = mtr.latch_memo(); - Frame *frame = nullptr; + LatchMemo &latch_memo = mtr.latch_memo(); + Frame *frame = nullptr; RC rc = latch_memo.get_page(file_header_.root_page, frame); // 这里仅仅调试使用，不加root锁 if (OB_FAIL(rc)) { @@ -1243,8 +1230,8 @@ RC BplusTreeHandler::crabing_protocal_fetch_page( BplusTreeMiniTransaction &mtr, BplusTreeOperationType op, PageNum page_num, bool is_root_node, Frame *&frame) { LatchMemo &latch_memo = mtr.latch_memo(); - bool readonly = (op == BplusTreeOperationType::READ); - const int memo_point = latch_memo.memo_point(); + bool readonly = (op == BplusTreeOperationType::READ); + const int memo_point = latch_memo.memo_point(); RC rc = latch_memo.get_page(page_num, frame); if (OB_FAIL(rc)) { @@ -1261,7 +1248,8 @@ RC BplusTreeHandler::crabing_protocal_fetch_page( return rc; } -RC BplusTreeHandler::insert_entry_into_leaf_node(BplusTreeMiniTransaction &mtr, Frame *frame, const char *key, const RID *rid) +RC BplusTreeHandler::insert_entry_into_leaf_node( + BplusTreeMiniTransaction &mtr, Frame *frame, const char *key, const RID *rid) { LeafIndexNodeHandler leaf_node(mtr, file_header_, frame); bool exists = false; // 该数据是否已经存在指定的叶子节点中了 @@ -1299,7 +1287,8 @@ RC BplusTreeHandler::insert_entry_into_leaf_node(BplusTreeMiniTransaction &mtr, return insert_entry_into_parent(mtr, frame, new_frame, new_index_node.key_at(0)); } -RC BplusTreeHandler::insert_entry_into_parent(BplusTreeMiniTransaction &mtr, Frame *frame, Frame *new_frame, const char *key) +RC BplusTreeHandler::insert_entry_into_parent( + BplusTreeMiniTransaction &mtr, Frame *frame, Frame *new_frame, const char *key) { RC rc = RC::SUCCESS; @@ -1311,7 +1300,7 @@ RC BplusTreeHandler::insert_entry_into_parent(BplusTreeMiniTransaction &mtr, Fra // create new root page Frame *root_frame = nullptr; - rc = disk_buffer_pool_->allocate_page(&root_frame); + rc = disk_buffer_pool_->allocate_page(&root_frame); if (OB_FAIL(rc)) { LOG_WARN("failed to allocate new root page. rc=%d:%s", rc, strrc(rc)); return rc; @@ -1431,11 +1420,12 @@ RC BplusTreeHandler::recover_update_root_page(BplusTreeMiniTransaction &mtr, Pag return RC::SUCCESS; } -RC BplusTreeHandler::recover_init_header_page(BplusTreeMiniTransaction &mtr, Frame *frame, const IndexFileHeader &header) +RC BplusTreeHandler::recover_init_header_page( + BplusTreeMiniTransaction &mtr, Frame *frame, const IndexFileHeader &header) { IndexFileHeader *file_header = reinterpret_cast(frame->data()); memcpy(file_header, &header, sizeof(IndexFileHeader)); - file_header_ = header; + file_header_ = header; header_dirty_ = false; frame->mark_dirty(); @@ -1733,7 +1723,8 @@ RC BplusTreeHandler::coalesce( } template -RC BplusTreeHandler::redistribute(BplusTreeMiniTransaction &mtr, Frame *neighbor_frame, Frame *frame, Frame *parent_frame, int index) +RC BplusTreeHandler::redistribute( + BplusTreeMiniTransaction &mtr, Frame *neighbor_frame, Frame *frame, Frame *parent_frame, int index) { InternalIndexNodeHandler parent_node(mtr, file_header_, parent_frame); IndexNodeHandlerType neighbor_node(mtr, file_header_, neighbor_frame); @@ -1822,9 +1813,7 @@ RC BplusTreeHandler::delete_entry(const char *user_key, const RID *rid) //////////////////////////////////////////////////////////////////////////////// -BplusTreeScanner::BplusTreeScanner(BplusTreeHandler &tree_handler) - : tree_handler_(tree_handler), mtr_(tree_handler) -{} +BplusTreeScanner::BplusTreeScanner(BplusTreeHandler &tree_handler) : tree_handler_(tree_handler), mtr_(tree_handler) {} BplusTreeScanner::~BplusTreeScanner() { close(); } @@ -1860,7 +1849,7 @@ RC BplusTreeScanner::open(const char *left_user_key, int left_len, bool left_inc current_frame_ = nullptr; return RC::SUCCESS; } - + LOG_WARN("failed to find left most page. rc=%s", strrc(rc)); return rc; } @@ -2096,4 +2085,4 @@ RC BplusTreeScanner::fix_user_key( *fixed_key = key_buf; return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/index/bplus_tree.h b/src/observer/storage/index/bplus_tree.h index cda1c0a13..cd51492f5 100644 --- a/src/observer/storage/index/bplus_tree.h +++ b/src/observer/storage/index/bplus_tree.h @@ -723,4 +723,4 @@ class BplusTreeScanner int iter_index_ = -1; bool first_emitted_ = false; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/index/bplus_tree_index.cpp b/src/observer/storage/index/bplus_tree_index.cpp index e562f4c24..90d1496e0 100644 --- a/src/observer/storage/index/bplus_tree_index.cpp +++ b/src/observer/storage/index/bplus_tree_index.cpp @@ -57,7 +57,7 @@ RC BplusTreeIndex::open(Table *table, const char *file_name, const IndexMeta &in Index::init(index_meta, field_meta); BufferPoolManager &bpm = table->db()->buffer_pool_manager(); - RC rc = index_handler_.open(table->db()->log_handler(), bpm, file_name); + RC rc = index_handler_.open(table->db()->log_handler(), bpm, file_name); if (RC::SUCCESS != rc) { LOG_WARN("Failed to open index_handler, file_name:%s, index:%s, field:%s, rc:%s", file_name, index_meta.name(), index_meta.field(), strrc(rc)); @@ -125,4 +125,4 @@ RC BplusTreeIndexScanner::destroy() delete this; return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/index/bplus_tree_index.h b/src/observer/storage/index/bplus_tree_index.h index 566ac7250..e39f21a4c 100644 --- a/src/observer/storage/index/bplus_tree_index.h +++ b/src/observer/storage/index/bplus_tree_index.h @@ -69,4 +69,4 @@ class BplusTreeIndexScanner : public IndexScanner private: BplusTreeScanner tree_scanner_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/index/bplus_tree_log.cpp b/src/observer/storage/index/bplus_tree_log.cpp index 61409e72f..144343300 100644 --- a/src/observer/storage/index/bplus_tree_log.cpp +++ b/src/observer/storage/index/bplus_tree_log.cpp @@ -184,13 +184,14 @@ RC BplusTreeLogger::redo(BufferPoolManager &bpm, const LogEntry &entry) return rc; } -RC BplusTreeLogger::__redo(LSN lsn, BplusTreeMiniTransaction &mtr, BplusTreeHandler &tree_handler, Deserializer &redo_buffer) +RC BplusTreeLogger::__redo( + LSN lsn, BplusTreeMiniTransaction &mtr, BplusTreeHandler &tree_handler, Deserializer &redo_buffer) { need_log_ = false; DEFER(need_log_ = true); - RC rc = RC::SUCCESS; + RC rc = RC::SUCCESS; vector frames; while (redo_buffer.remain() > 0) { unique_ptr entry; @@ -204,8 +205,8 @@ RC BplusTreeLogger::__redo(LSN lsn, BplusTreeMiniTransaction &mtr, BplusTreeHand if (frame != nullptr) { if (frame->lsn() >= lsn) { LOG_TRACE("no need to redo. frame=%p:%s, redo lsn=%ld", frame, frame->to_string().c_str(), lsn); - frame->unpin(); - continue; + frame->unpin(); + continue; } else { frames.push_back(frame); } @@ -275,7 +276,7 @@ BplusTreeMiniTransaction::~BplusTreeMiniTransaction() if (nullptr == operation_result_) { return; } - + if (OB_SUCC(*operation_result_)) { commit(); } else { @@ -292,4 +293,4 @@ RC BplusTreeMiniTransaction::rollback() { return logger_.rollback(*this, tree_ha BplusTreeLogReplayer::BplusTreeLogReplayer(BufferPoolManager &bpm) : buffer_pool_manager_(bpm) {} RC BplusTreeLogReplayer::replay(const LogEntry &entry) { return BplusTreeLogger::redo(buffer_pool_manager_, entry); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/index/bplus_tree_log.h b/src/observer/storage/index/bplus_tree_log.h index bbc6b95cb..1d0a27942 100644 --- a/src/observer/storage/index/bplus_tree_log.h +++ b/src/observer/storage/index/bplus_tree_log.h @@ -208,4 +208,4 @@ class BplusTreeLogReplayer final : public LogReplayer private: BufferPoolManager &buffer_pool_manager_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/index/bplus_tree_log_entry.cpp b/src/observer/storage/index/bplus_tree_log_entry.cpp index ca05db3af..547342ad2 100644 --- a/src/observer/storage/index/bplus_tree_log_entry.cpp +++ b/src/observer/storage/index/bplus_tree_log_entry.cpp @@ -365,7 +365,7 @@ LeafInitEmptyLogEntryHandler::LeafInitEmptyLogEntryHandler(Frame *frame) RC LeafInitEmptyLogEntryHandler::redo(BplusTreeMiniTransaction &mtr, BplusTreeHandler &tree_handler) { LeafIndexNodeHandler leaf_handler(mtr, tree_handler.file_header(), frame()); - RC rc = leaf_handler.init_empty(); + RC rc = leaf_handler.init_empty(); return rc; } @@ -496,7 +496,7 @@ RC InternalCreateNewRootLogEntryHandler::deserialize( RC InternalCreateNewRootLogEntryHandler::redo(BplusTreeMiniTransaction &mtr, BplusTreeHandler &tree_handler) { InternalIndexNodeHandler internal_handler(mtr, tree_handler.file_header(), frame()); - RC rc = internal_handler.create_new_root(first_page_num_, key_.data(), page_num_); + RC rc = internal_handler.create_new_root(first_page_num_, key_.data(), page_num_); return rc; } @@ -608,4 +608,4 @@ RC UpdateRootPageLogEntryHandler::redo(BplusTreeMiniTransaction &mtr, BplusTreeH } } // namespace bplus_tree -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/index/bplus_tree_log_entry.h b/src/observer/storage/index/bplus_tree_log_entry.h index c79c815b6..75739dfb4 100644 --- a/src/observer/storage/index/bplus_tree_log_entry.h +++ b/src/observer/storage/index/bplus_tree_log_entry.h @@ -379,4 +379,4 @@ class InternalUpdateKeyLogEntryHandler : public NodeLogEntryHandler }; } // namespace bplus_tree -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/index/index.cpp b/src/observer/storage/index/index.cpp index b71011130..ba332a61f 100644 --- a/src/observer/storage/index/index.cpp +++ b/src/observer/storage/index/index.cpp @@ -22,4 +22,4 @@ RC Index::init(const IndexMeta &index_meta, const FieldMeta &field_meta) field_meta_ = field_meta; return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/index/index.h b/src/observer/storage/index/index.h index 8ee0d060e..becf2cd7d 100644 --- a/src/observer/storage/index/index.h +++ b/src/observer/storage/index/index.h @@ -115,4 +115,4 @@ class IndexScanner virtual RC next_entry(RID *rid) = 0; virtual RC destroy() = 0; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/index/index_meta.cpp b/src/observer/storage/index/index_meta.cpp index dfa5755e5..0a3c30939 100644 --- a/src/observer/storage/index/index_meta.cpp +++ b/src/observer/storage/index/index_meta.cpp @@ -71,4 +71,4 @@ const char *IndexMeta::name() const { return name_.c_str(); } const char *IndexMeta::field() const { return field_.c_str(); } void IndexMeta::desc(ostream &os) const { os << "index name=" << name_ << ", field=" << field_; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/index/index_meta.h b/src/observer/storage/index/index_meta.h index b879ad08e..8ea300d5c 100644 --- a/src/observer/storage/index/index_meta.h +++ b/src/observer/storage/index/index_meta.h @@ -53,4 +53,4 @@ class IndexMeta string name_; // index's name string field_; // field's name }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/index/ivfflat_index.h b/src/observer/storage/index/ivfflat_index.h index 65446fde1..52c3a8d09 100644 --- a/src/observer/storage/index/ivfflat_index.h +++ b/src/observer/storage/index/ivfflat_index.h @@ -21,7 +21,7 @@ namespace oceanbase { class IvfflatIndex : public Index { public: - IvfflatIndex(){}; + IvfflatIndex() {}; virtual ~IvfflatIndex() noexcept {}; RC create(Table *table, const char *file_name, const IndexMeta &index_meta, const FieldMeta &field_meta) @@ -49,4 +49,4 @@ class IvfflatIndex : public Index int lists_ = 1; int probes_ = 1; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/index/latch_memo.cpp b/src/observer/storage/index/latch_memo.cpp index 32548932a..28e4b9e5e 100644 --- a/src/observer/storage/index/latch_memo.cpp +++ b/src/observer/storage/index/latch_memo.cpp @@ -160,4 +160,4 @@ void LatchMemo::release_to(int point) } items_.erase(items_.begin(), iter); } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/index/latch_memo.h b/src/observer/storage/index/latch_memo.h index ef27e71e8..9c9132d08 100644 --- a/src/observer/storage/index/latch_memo.h +++ b/src/observer/storage/index/latch_memo.h @@ -90,4 +90,4 @@ class LatchMemo final deque items_; vector disposed_pages_; /// 等待释放的页面 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/persist/persist.cpp b/src/observer/storage/persist/persist.cpp index a424ad7a1..81232b5f3 100644 --- a/src/observer/storage/persist/persist.cpp +++ b/src/observer/storage/persist/persist.cpp @@ -284,4 +284,4 @@ RC PersistHandler::seek(uint64_t offset) return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/persist/persist.h b/src/observer/storage/persist/persist.h index 894709da8..c3847fbc4 100644 --- a/src/observer/storage/persist/persist.h +++ b/src/observer/storage/persist/persist.h @@ -66,4 +66,4 @@ class PersistHandler string file_name_; int file_desc_ = -1; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/record/heap_record_scanner.cpp b/src/observer/storage/record/heap_record_scanner.cpp index 34245cdbd..a5517b67e 100644 --- a/src/observer/storage/record/heap_record_scanner.cpp +++ b/src/observer/storage/record/heap_record_scanner.cpp @@ -14,7 +14,6 @@ See the Mulan PSL v2 for more details. */ namespace oceanbase { - RC HeapRecordScanner::open_scan() { ASSERT(disk_buffer_pool_ != nullptr, "disk buffer pool is null"); @@ -147,4 +146,4 @@ RC HeapRecordScanner::next(Record &record) record = next_record_; return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/record/heap_record_scanner.h b/src/observer/storage/record/heap_record_scanner.h index 7109b9b0c..79646be4d 100644 --- a/src/observer/storage/record/heap_record_scanner.h +++ b/src/observer/storage/record/heap_record_scanner.h @@ -70,7 +70,7 @@ class HeapRecordScanner : public RecordScanner DiskBufferPool *disk_buffer_pool_ = nullptr; ///< 当前访问的文件 Trx *trx_ = nullptr; ///< 当前是哪个事务在遍历 LogHandler *log_handler_ = nullptr; - ReadWriteMode rw_mode_ = ReadWriteMode::READ_WRITE; ///< 遍历出来的数据，是否可能对它做修改 + ReadWriteMode rw_mode_ = ReadWriteMode::READ_WRITE; ///< 遍历出来的数据，是否可能对它做修改 BufferPoolIterator bp_iterator_; ///< 遍历buffer pool的所有页面 ConditionFilter *condition_filter_ = nullptr; ///< 过滤record @@ -78,4 +78,4 @@ class HeapRecordScanner : public RecordScanner RecordPageIterator record_page_iterator_; ///< 遍历某个页面上的所有record Record next_record_; ///< 获取的记录放在这里缓存起来 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/record/lob_handler.cpp b/src/observer/storage/record/lob_handler.cpp index 3f1c9f45b..1a1284852 100644 --- a/src/observer/storage/record/lob_handler.cpp +++ b/src/observer/storage/record/lob_handler.cpp @@ -12,10 +12,7 @@ See the Mulan PSL v2 for more details. */ namespace oceanbase { -RC LobFileHandler::create_file(const char *file_name) -{ - return file_.create_file(file_name); -} +RC LobFileHandler::create_file(const char *file_name) { return file_.create_file(file_name); } RC LobFileHandler::open_file(const char *file_name) { @@ -30,10 +27,10 @@ RC LobFileHandler::open_file(const char *file_name) RC LobFileHandler::insert_data(int64_t &offset, int64_t length, const char *data) { - RC rc = RC::SUCCESS; - int64_t out_size = 0; + RC rc = RC::SUCCESS; + int64_t out_size = 0; int64_t end_offset = 0; - rc = file_.append(length, data, &out_size, &end_offset); + rc = file_.append(length, data, &out_size, &end_offset); if (OB_FAIL(rc)) { return rc; } @@ -44,4 +41,4 @@ RC LobFileHandler::insert_data(int64_t &offset, int64_t length, const char *data return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/record/lob_handler.h b/src/observer/storage/record/lob_handler.h index 9db8ca728..3dd45676c 100644 --- a/src/observer/storage/record/lob_handler.h +++ b/src/observer/storage/record/lob_handler.h @@ -41,4 +41,4 @@ class LobFileHandler private: PersistHandler file_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/record/lsm_record_scanner.cpp b/src/observer/storage/record/lsm_record_scanner.cpp index a85f28bd1..6dc0ccf15 100644 --- a/src/observer/storage/record/lsm_record_scanner.cpp +++ b/src/observer/storage/record/lsm_record_scanner.cpp @@ -25,7 +25,7 @@ RC LsmRecordScanner::open_scan() lsm_iter_ = oblsm_->new_iterator(ObLsmReadOptions()); } else if (trx_->type() == TrxKit::Type::LSM) { auto lsm_trx = dynamic_cast(trx_); - lsm_iter_ = lsm_trx->get_trx()->new_iterator(ObLsmReadOptions()); + lsm_iter_ = lsm_trx->get_trx()->new_iterator(ObLsmReadOptions()); } bytes encoded_key; rc = Codec::encode_without_rid(table_->table_id(), encoded_key); @@ -38,7 +38,6 @@ RC LsmRecordScanner::open_scan() return rc; } - RC LsmRecordScanner::close_scan() { if (lsm_iter_ != nullptr) { @@ -52,9 +51,9 @@ RC LsmRecordScanner::next(Record &record) { if (lsm_iter_->valid()) { string_view lsm_value = lsm_iter_->value(); - string_view lsm_key = lsm_iter_->key(); - int64_t table_id = 0; - bytes lsm_key_bytes(lsm_key.begin(), lsm_key.end()); + string_view lsm_key = lsm_iter_->key(); + int64_t table_id = 0; + bytes lsm_key_bytes(lsm_key.begin(), lsm_key.end()); Codec::decode(lsm_key_bytes, table_id); if (table_id != table_->table_id()) { LOG_TRACE("table id not match, table id: %ld", table_->table_id()); @@ -69,4 +68,4 @@ RC LsmRecordScanner::next(Record &record) } return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/record/lsm_record_scanner.h b/src/observer/storage/record/lsm_record_scanner.h index fa6dcd369..8987f44e6 100644 --- a/src/observer/storage/record/lsm_record_scanner.h +++ b/src/observer/storage/record/lsm_record_scanner.h @@ -51,4 +51,4 @@ class LsmRecordScanner : public RecordScanner RowTuple tuple_; Record record_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/record/record.h b/src/observer/storage/record/record.h index 0c2c665ff..711c7524f 100644 --- a/src/observer/storage/record/record.h +++ b/src/observer/storage/record/record.h @@ -268,4 +268,4 @@ class Record int len_ = 0; /// 如果不是record自己来管理内存，这个字段可能是无效的 bool owner_ = false; /// 表示当前是否由record来管理内存 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/record/record_log.cpp b/src/observer/storage/record/record_log.cpp index 81ce82be4..2a537eca3 100644 --- a/src/observer/storage/record/record_log.cpp +++ b/src/observer/storage/record/record_log.cpp @@ -331,4 +331,4 @@ RC RecordLogReplayer::replay_update(DiskBufferPool &buffer_pool, const RecordLog return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/record/record_log.h b/src/observer/storage/record/record_log.h index c006623d4..c162c0af2 100644 --- a/src/observer/storage/record/record_log.h +++ b/src/observer/storage/record/record_log.h @@ -155,4 +155,4 @@ class RecordLogReplayer final : public LogReplayer private: BufferPoolManager &bpm_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/record/record_manager.cpp b/src/observer/storage/record/record_manager.cpp index 8522481ee..7be630f16 100644 --- a/src/observer/storage/record/record_manager.cpp +++ b/src/observer/storage/record/record_manager.cpp @@ -801,4 +801,4 @@ RC ChunkFileScanner::next_chunk(Chunk &chunk) record_page_handler_->cleanup(); return RC::RECORD_EOF; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/record/record_manager.h b/src/observer/storage/record/record_manager.h index 337b6ac4f..f1a77c203 100644 --- a/src/observer/storage/record/record_manager.h +++ b/src/observer/storage/record/record_manager.h @@ -263,12 +263,12 @@ class RecordPageHandler protected: DiskBufferPool *disk_buffer_pool_ = nullptr; ///< 当前操作的buffer pool(文件) RecordLogHandler log_handler_; ///< 当前操作的日志处理器 - Frame *frame_ = nullptr; ///< 当前操作页面关联的frame(frame的更多概念可以参考buffer pool和frame) - ReadWriteMode rw_mode_ = ReadWriteMode::READ_WRITE; ///< 当前的操作是否都是只读的 - PageHeader *page_header_ = nullptr; ///< 当前页面上页面头 - char *bitmap_ = nullptr; ///< 当前页面上record分配状态信息bitmap内存起始位置 - StorageFormat storage_format_; - LobFileHandler *lob_handler_ = nullptr; + Frame *frame_ = nullptr; ///< 当前操作页面关联的frame(frame的更多概念可以参考buffer pool和frame) + ReadWriteMode rw_mode_ = ReadWriteMode::READ_WRITE; ///< 当前的操作是否都是只读的 + PageHeader *page_header_ = nullptr; ///< 当前页面上页面头 + char *bitmap_ = nullptr; ///< 当前页面上record分配状态信息bitmap内存起始位置 + StorageFormat storage_format_; + LobFileHandler *lob_handler_ = nullptr; protected: friend class RecordPageIterator; @@ -367,7 +367,7 @@ class PaxRecordPageHandler : public RecordPageHandler class RecordFileHandler { public: - RecordFileHandler(StorageFormat storage_format) : storage_format_(storage_format){}; + RecordFileHandler(StorageFormat storage_format) : storage_format_(storage_format) {}; ~RecordFileHandler(); /** @@ -423,7 +423,7 @@ class RecordFileHandler DiskBufferPool *disk_buffer_pool_ = nullptr; LogHandler *log_handler_ = nullptr; ///< 记录日志的处理器 unordered_set free_pages_; ///< 没有填充满的页面集合 - common::Mutex lock_; ///< 当编译时增加-DCONCURRENCY=ON 选项时，才会真正的支持并发 + common::Mutex lock_; ///< 当编译时增加-DCONCURRENCY=ON 选项时，才会真正的支持并发 StorageFormat storage_format_; TableMeta *table_meta_; LobFileHandler *lob_handler_ = nullptr; @@ -458,9 +458,9 @@ class ChunkFileScanner DiskBufferPool *disk_buffer_pool_ = nullptr; ///< 当前访问的文件 LogHandler *log_handler_ = nullptr; - ReadWriteMode rw_mode_ = ReadWriteMode::READ_WRITE; ///< 遍历出来的数据，是否可能对它做修改 + ReadWriteMode rw_mode_ = ReadWriteMode::READ_WRITE; ///< 遍历出来的数据，是否可能对它做修改 BufferPoolIterator bp_iterator_; ///< 遍历buffer pool的所有页面 RecordPageHandler *record_page_handler_ = nullptr; ///< 处理文件某页面的记录 }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/record/record_scanner.h b/src/observer/storage/record/record_scanner.h index 312b3cc66..c16855ca8 100644 --- a/src/observer/storage/record/record_scanner.h +++ b/src/observer/storage/record/record_scanner.h @@ -42,4 +42,4 @@ class RecordScanner */ virtual RC next(Record &record) = 0; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/table/heap_table_engine.cpp b/src/observer/storage/table/heap_table_engine.cpp index 75b469548..203d0736a 100644 --- a/src/observer/storage/table/heap_table_engine.cpp +++ b/src/observer/storage/table/heap_table_engine.cpp @@ -15,7 +15,6 @@ See the Mulan PSL v2 for more details. */ #include "storage/common/meta_util.h" #include "storage/db/db.h" - namespace oceanbase { HeapTableEngine::~HeapTableEngine() @@ -63,7 +62,7 @@ RC HeapTableEngine::insert_record(Record &record) return rc; } -RC HeapTableEngine::insert_chunk(const Chunk& chunk) +RC HeapTableEngine::insert_chunk(const Chunk &chunk) { RC rc = RC::SUCCESS; rc = record_handler_->insert_chunk(chunk, table_meta_->record_size()); @@ -108,7 +107,7 @@ RC HeapTableEngine::delete_record(const Record &record) RC HeapTableEngine::get_record_scanner(RecordScanner *&scanner, Trx *trx, ReadWriteMode mode) { scanner = new HeapRecordScanner(table_, *data_buffer_pool_, trx, db_->log_handler(), mode, nullptr); - RC rc = scanner->open_scan(); + RC rc = scanner->open_scan(); if (rc != RC::SUCCESS) { LOG_ERROR("failed to open scanner. rc=%s", strrc(rc)); } @@ -153,7 +152,7 @@ RC HeapTableEngine::create_index(Trx *trx, const FieldMeta *field_meta, const ch // 遍历当前的所有数据，插入这个索引 RecordScanner *scanner = nullptr; - rc = get_record_scanner(scanner, trx, ReadWriteMode::READ_ONLY); + rc = get_record_scanner(scanner, trx, ReadWriteMode::READ_ONLY); if (rc != RC::SUCCESS) { LOG_WARN("failed to create scanner while creating index. table=%s, index=%s, rc=%s", table_meta_->name(), index_name, strrc(rc)); @@ -343,4 +342,4 @@ RC HeapTableEngine::open() } return rc; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/table/heap_table_engine.h b/src/observer/storage/table/heap_table_engine.h index 00fe5a9c8..d969be4d2 100644 --- a/src/observer/storage/table/heap_table_engine.h +++ b/src/observer/storage/table/heap_table_engine.h @@ -62,4 +62,4 @@ class HeapTableEngine : public TableEngine Db *db_; Table *table_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/table/lsm_table_engine.cpp b/src/observer/storage/table/lsm_table_engine.cpp index a47a6b2e5..f5a19f752 100644 --- a/src/observer/storage/table/lsm_table_engine.cpp +++ b/src/observer/storage/table/lsm_table_engine.cpp @@ -18,10 +18,8 @@ See the Mulan PSL v2 for more details. */ #include "storage/common/codec.h" #include "storage/trx/lsm_mvcc_trx.h" - namespace oceanbase { - RC LsmTableEngine::insert_record(Record &record) { RC rc = RC::SUCCESS; @@ -36,16 +34,13 @@ RC LsmTableEngine::insert_record(Record &record) RC LsmTableEngine::get_record_scanner(RecordScanner *&scanner, Trx *trx, ReadWriteMode mode) { scanner = new LsmRecordScanner(table_, db_->lsm(), trx); - RC rc = scanner->open_scan(); + RC rc = scanner->open_scan(); if (rc != RC::SUCCESS) { LOG_ERROR("failed to open scanner. rc=%s", strrc(rc)); } return rc; } -RC LsmTableEngine::open() -{ - return RC::UNIMPLEMENTED; -} +RC LsmTableEngine::open() { return RC::UNIMPLEMENTED; } -} // namespace oceanbase \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/table/lsm_table_engine.h b/src/observer/storage/table/lsm_table_engine.h index 6daf16029..6acf84eb6 100644 --- a/src/observer/storage/table/lsm_table_engine.h +++ b/src/observer/storage/table/lsm_table_engine.h @@ -58,4 +58,4 @@ class LsmTableEngine : public TableEngine ObLsm *lsm_; atomic inc_id_{0}; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/table/table.cpp b/src/observer/storage/table/table.cpp index 0e2704a15..4eb3df8c7 100644 --- a/src/observer/storage/table/table.cpp +++ b/src/observer/storage/table/table.cpp @@ -46,7 +46,8 @@ Table::~Table() } RC Table::create(Db *db, int32_t table_id, const char *path, const char *name, const char *base_dir, - span attributes, const vector &primary_keys, StorageFormat storage_format, StorageEngine storage_engine) + span attributes, const vector &primary_keys, StorageFormat storage_format, + StorageEngine storage_engine) { if (table_id < 0) { LOG_WARN("invalid table id. table_id=%d, table_name=%s", table_id, name); @@ -82,7 +83,8 @@ RC Table::create(Db *db, int32_t table_id, const char *path, const char *name, c // 创建文件 const vector *trx_fields = db->trx_kit().trx_fields(); - if ((rc = table_meta_.init(table_id, name, trx_fields, attributes, primary_keys, storage_format, storage_engine)) != RC::SUCCESS) { + if ((rc = table_meta_.init(table_id, name, trx_fields, attributes, primary_keys, storage_format, storage_engine)) != + RC::SUCCESS) { LOG_ERROR("Failed to init table meta. name:%s, ret:%d", name, rc); return rc; // delete table file } @@ -98,7 +100,7 @@ RC Table::create(Db *db, int32_t table_id, const char *path, const char *name, c table_meta_.serialize(fs); fs.close(); - db_ = db; + db_ = db; string data_file = table_data_file(base_dir, name); BufferPoolManager &bpm = db->buffer_pool_manager(); @@ -144,7 +146,7 @@ RC Table::open(Db *db, const char *meta_file, const char *base_dir) } fs.close(); - db_ = db; + db_ = db; // // 加载数据文件 // RC rc = init_record_handler(base_dir); @@ -157,7 +159,7 @@ RC Table::open(Db *db, const char *meta_file, const char *base_dir) if (table_meta_.storage_engine() == StorageEngine::HEAP) { engine_ = make_unique(&table_meta_, db_, this); - } else if (table_meta_.storage_engine() == StorageEngine::LSM) { + } else if (table_meta_.storage_engine() == StorageEngine::LSM) { engine_ = make_unique(&table_meta_, db_, this); } else { rc = RC::UNSUPPORTED; @@ -174,39 +176,24 @@ RC Table::open(Db *db, const char *meta_file, const char *base_dir) return rc; } -RC Table::insert_record(Record &record) -{ - return engine_->insert_record(record); -} +RC Table::insert_record(Record &record) { return engine_->insert_record(record); } -RC Table::insert_chunk(const Chunk& chunk) -{ - return engine_->insert_chunk(chunk); -} +RC Table::insert_chunk(const Chunk &chunk) { return engine_->insert_chunk(chunk); } -RC Table::visit_record(const RID &rid, function visitor) -{ - return engine_->visit_record(rid, visitor); -} +RC Table::visit_record(const RID &rid, function visitor) { return engine_->visit_record(rid, visitor); } -RC Table::insert_record_with_trx(Record &record, Trx *trx) -{ - return engine_->insert_record_with_trx(record, trx); -} +RC Table::insert_record_with_trx(Record &record, Trx *trx) { return engine_->insert_record_with_trx(record, trx); } RC Table::delete_record_with_trx(const Record &record, Trx *trx) { return engine_->delete_record_with_trx(record, trx); } -RC Table::update_record_with_trx(const Record &old_record, const Record &new_record, Trx* trx) +RC Table::update_record_with_trx(const Record &old_record, const Record &new_record, Trx *trx) { return engine_->update_record_with_trx(old_record, new_record, trx); } -RC Table::get_record(const RID &rid, Record &record) -{ - return engine_->get_record(rid, record); -} +RC Table::get_record(const RID &rid, Record &record) { return engine_->get_record(rid, record); } const char *Table::name() const { return table_meta_.name(); } @@ -229,7 +216,7 @@ RC Table::make_record(int value_num, const Value *values, Record &record) for (int i = 0; i < value_num && OB_SUCC(rc); i++) { const FieldMeta *field = table_meta_.field(i + normal_field_start_index); - const Value & value = values[i]; + const Value &value = values[i]; if (field->type() != value.attr_type()) { Value real_value; rc = Value::cast_to(value, field->type(), real_value); @@ -281,22 +268,10 @@ RC Table::create_index(Trx *trx, const FieldMeta *field_meta, const char *index_ return engine_->create_index(trx, field_meta, index_name); } -RC Table::delete_record(const Record &record) -{ - return engine_->delete_record(record); -} +RC Table::delete_record(const Record &record) { return engine_->delete_record(record); } -Index *Table::find_index(const char *index_name) const -{ - return engine_->find_index(index_name); -} -Index *Table::find_index_by_field(const char *field_name) const -{ - return engine_->find_index_by_field(field_name); -} +Index *Table::find_index(const char *index_name) const { return engine_->find_index(index_name); } +Index *Table::find_index_by_field(const char *field_name) const { return engine_->find_index_by_field(field_name); } -RC Table::sync() -{ - return engine_->sync(); -} -} \ No newline at end of file +RC Table::sync() { return engine_->sync(); } +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/table/table.h b/src/observer/storage/table/table.h index 5552de7e8..cdc8b0734 100644 --- a/src/observer/storage/table/table.h +++ b/src/observer/storage/table/table.h @@ -142,4 +142,4 @@ class Table unique_ptr engine_ = nullptr; LobFileHandler *lob_handler_ = nullptr; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/table/table_engine.h b/src/observer/storage/table/table_engine.h index fce75a54c..51e621d8f 100644 --- a/src/observer/storage/table/table_engine.h +++ b/src/observer/storage/table/table_engine.h @@ -62,4 +62,4 @@ class TableEngine protected: TableMeta *table_meta_ = nullptr; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/table/table_meta.cpp b/src/observer/storage/table/table_meta.cpp index 5e91d5624..64d876322 100644 --- a/src/observer/storage/table/table_meta.cpp +++ b/src/observer/storage/table/table_meta.cpp @@ -49,8 +49,8 @@ void TableMeta::swap(TableMeta &other) noexcept } RC TableMeta::init(int32_t table_id, const char *name, const vector *trx_fields, - span attributes, const vector &primary_keys, StorageFormat storage_format, - StorageEngine storage_engine) + span attributes, const vector &primary_keys, StorageFormat storage_format, + StorageEngine storage_engine) { if (common::is_blank(name)) { LOG_ERROR("Name cannot be empty"); @@ -73,7 +73,12 @@ RC TableMeta::init(int32_t table_id, const char *name, const vector * fields_.resize(attributes.size() + trx_fields->size()); for (size_t i = 0; i < trx_fields->size(); i++) { const FieldMeta &field_meta = (*trx_fields)[i]; - fields_[i] = FieldMeta(field_meta.name(), field_meta.type(), field_offset, field_meta.len(), false /*visible*/, field_meta.field_id()); + fields_[i] = FieldMeta(field_meta.name(), + field_meta.type(), + field_offset, + field_meta.len(), + false /*visible*/, + field_meta.field_id()); field_offset += field_meta.len(); } @@ -86,7 +91,7 @@ RC TableMeta::init(int32_t table_id, const char *name, const vector * const AttrInfoSqlNode &attr_info = attributes[i]; // `i` is the col_id of fields[i] rc = fields_[i + trx_field_num].init( - attr_info.name.c_str(), attr_info.type, field_offset, attr_info.length, true /*visible*/, i); + attr_info.name.c_str(), attr_info.type, field_offset, attr_info.length, true /*visible*/, i); if (OB_FAIL(rc)) { LOG_ERROR("Failed to init field meta. table name=%s, field name: %s", name, attr_info.name.c_str()); return rc; @@ -96,10 +101,10 @@ RC TableMeta::init(int32_t table_id, const char *name, const vector * } primary_keys_ = primary_keys; - record_size_ = field_offset; + record_size_ = field_offset; - table_id_ = table_id; - name_ = name; + table_id_ = table_id; + name_ = name; storage_format_ = storage_format; storage_engine_ = storage_engine; LOG_INFO("Sussessfully initialized table meta. table id=%d, name=%s", table_id, name); @@ -116,10 +121,7 @@ const char *TableMeta::name() const { return name_.c_str(); } const FieldMeta *TableMeta::trx_field() const { return &fields_[0]; } -span TableMeta::trx_fields() const -{ - return span(fields_.data(), sys_field_num()); -} +span TableMeta::trx_fields() const { return span(fields_.data(), sys_field_num()); } const FieldMeta *TableMeta::field(int index) const { return &fields_[index]; } const FieldMeta *TableMeta::field(const char *name) const @@ -177,8 +179,8 @@ int TableMeta::record_size() const { return record_size_; } int TableMeta::serialize(ostream &ss) const { Json::Value table_value; - table_value[FIELD_TABLE_ID] = table_id_; - table_value[FIELD_TABLE_NAME] = name_; + table_value[FIELD_TABLE_ID] = table_id_; + table_value[FIELD_TABLE_NAME] = name_; table_value[FIELD_STORAGE_FORMAT] = static_cast(storage_format_); table_value[FIELD_STORAGE_ENGINE] = static_cast(storage_engine_); @@ -220,7 +222,7 @@ int TableMeta::deserialize(istream &is) { Json::Value table_value; Json::CharReaderBuilder builder; - string errors; + string errors; streampos old_pos = is.tellg(); if (!Json::parseFromStream(builder, is, &table_value, &errors)) { @@ -284,7 +286,7 @@ int TableMeta::deserialize(istream &is) auto comparator = [](const FieldMeta &f1, const FieldMeta &f2) { return f1.offset() < f2.offset(); }; sort(fields.begin(), fields.end(), comparator); - table_id_ = table_id; + table_id_ = table_id; storage_format_ = static_cast(storage_format); storage_engine_ = static_cast(storage_engine); name_.swap(table_name); @@ -293,7 +295,7 @@ int TableMeta::deserialize(istream &is) for (const FieldMeta &field_meta : fields_) { if (!field_meta.visible()) { - trx_fields_.push_back(field_meta); // 字段加上trx标识更好 + trx_fields_.push_back(field_meta); // 字段加上trx标识更好 } } @@ -303,7 +305,7 @@ int TableMeta::deserialize(istream &is) LOG_ERROR("Invalid table meta. indexes is not array, json value=%s", fields_value.toStyledString().c_str()); return -1; } - const int index_num = indexes_value.size(); + const int index_num = indexes_value.size(); vector indexes(index_num); for (int i = 0; i < index_num; i++) { IndexMeta &index = indexes[i]; @@ -324,7 +326,7 @@ int TableMeta::deserialize(istream &is) LOG_ERROR("Invalid table meta. primary keys is not array, json value=%s", fields_value.toStyledString().c_str()); return -1; } - const int primary_key_num = primary_keys_value.size(); + const int primary_key_num = primary_keys_value.size(); vector primary_keys(primary_key_num); for (int i = 0; i < primary_key_num; i++) { const Json::Value &field_name_value = primary_keys_value[i]; @@ -362,4 +364,4 @@ void TableMeta::desc(ostream &os) const } os << ')' << endl; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/table/table_meta.h b/src/observer/storage/table/table_meta.h index c144e0214..c6df68bf0 100644 --- a/src/observer/storage/table/table_meta.h +++ b/src/observer/storage/table/table_meta.h @@ -86,4 +86,4 @@ class TableMeta : public common::Serializable int record_size_ = 0; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/trx/lsm_mvcc_trx.cpp b/src/observer/storage/trx/lsm_mvcc_trx.cpp index a5b63e914..0d1c7ddbc 100644 --- a/src/observer/storage/trx/lsm_mvcc_trx.cpp +++ b/src/observer/storage/trx/lsm_mvcc_trx.cpp @@ -29,15 +29,9 @@ LogReplayer *LsmMvccTrxKit::create_log_replayer(Db &, LogHandler &) { return new //////////////////////////////////////////////////////////////////////////////// -RC LsmMvccTrx::insert_record(Table *table, Record &record) -{ - return table->insert_record_with_trx(record, this); -} +RC LsmMvccTrx::insert_record(Table *table, Record &record) { return table->insert_record_with_trx(record, this); } -RC LsmMvccTrx::delete_record(Table *table, Record &record) -{ - return table->delete_record_with_trx(record, this); -} +RC LsmMvccTrx::delete_record(Table *table, Record &record) { return table->delete_record_with_trx(record, this); } RC LsmMvccTrx::update_record(Table *table, Record &old_record, Record &new_record) { @@ -65,13 +59,10 @@ RC LsmMvccTrx::commit() return trx_->commit(); } -RC LsmMvccTrx::rollback() -{ - return trx_->rollback(); -} +RC LsmMvccTrx::rollback() { return trx_->rollback(); } /** * 实际没有使用 */ RC LsmMvccTrx::redo(Db *, const LogEntry &) { return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/trx/lsm_mvcc_trx.h b/src/observer/storage/trx/lsm_mvcc_trx.h index 0af9d53de..65bdf86f7 100644 --- a/src/observer/storage/trx/lsm_mvcc_trx.h +++ b/src/observer/storage/trx/lsm_mvcc_trx.h @@ -81,4 +81,4 @@ class LsmMvccTrxLogReplayer : public LogReplayer RC replay(const LogEntry &) override { return RC::SUCCESS; } }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/trx/mvcc_trx.cpp b/src/observer/storage/trx/mvcc_trx.cpp index 8ef770ae9..a4e560893 100644 --- a/src/observer/storage/trx/mvcc_trx.cpp +++ b/src/observer/storage/trx/mvcc_trx.cpp @@ -33,10 +33,11 @@ MvccTrxKit::~MvccTrxKit() RC MvccTrxKit::init() { // 事务使用一些特殊的字段，放到每行记录中，表示行记录的可见性。 - fields_ = vector{ - // field_id in trx fields is invisible. - FieldMeta("__trx_xid_begin", AttrType::INTS, 0 /*attr_offset*/, 4 /*attr_len*/, false /*visible*/, -1/*field_id*/), - FieldMeta("__trx_xid_end", AttrType::INTS, 0 /*attr_offset*/, 4 /*attr_len*/, false /*visible*/, -2/*field_id*/)}; + fields_ = vector{// field_id in trx fields is invisible. + FieldMeta( + "__trx_xid_begin", AttrType::INTS, 0 /*attr_offset*/, 4 /*attr_len*/, false /*visible*/, -1 /*field_id*/), + FieldMeta( + "__trx_xid_end", AttrType::INTS, 0 /*attr_offset*/, 4 /*attr_len*/, false /*visible*/, -2 /*field_id*/)}; LOG_INFO("init mvcc trx kit done."); return RC::SUCCESS; @@ -101,11 +102,12 @@ LogReplayer *MvccTrxKit::create_log_replayer(Db &db, LogHandler &log_handler) //////////////////////////////////////////////////////////////////////////////// -MvccTrx::MvccTrx(MvccTrxKit &kit, LogHandler &log_handler) : Trx(TrxKit::Type::MVCC), trx_kit_(kit), log_handler_(log_handler) +MvccTrx::MvccTrx(MvccTrxKit &kit, LogHandler &log_handler) + : Trx(TrxKit::Type::MVCC), trx_kit_(kit), log_handler_(log_handler) {} -MvccTrx::MvccTrx(MvccTrxKit &kit, LogHandler &log_handler, int32_t trx_id) - : Trx(TrxKit::Type::MVCC), trx_kit_(kit), log_handler_(log_handler), trx_id_(trx_id) +MvccTrx::MvccTrx(MvccTrxKit &kit, LogHandler &log_handler, int32_t trx_id) + : Trx(TrxKit::Type::MVCC), trx_kit_(kit), log_handler_(log_handler), trx_id_(trx_id) { started_ = true; recovering_ = true; @@ -433,9 +435,9 @@ RC find_table(Db *db, const LogEntry &log_entry, Table *&table) RC MvccTrx::redo(Db *db, const LogEntry &log_entry) { - auto *trx_log_header = reinterpret_cast(log_entry.data()); - Table *table = nullptr; - RC rc = find_table(db, log_entry, table); + auto *trx_log_header = reinterpret_cast(log_entry.data()); + Table *table = nullptr; + RC rc = find_table(db, log_entry, table); if (OB_FAIL(rc)) { return rc; } @@ -470,4 +472,4 @@ RC MvccTrx::redo(Db *db, const LogEntry &log_entry) return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/trx/mvcc_trx.h b/src/observer/storage/trx/mvcc_trx.h index ac55d8243..04c2e2c62 100644 --- a/src/observer/storage/trx/mvcc_trx.h +++ b/src/observer/storage/trx/mvcc_trx.h @@ -115,4 +115,4 @@ class MvccTrx : public Trx bool recovering_ = false; OperationSet operations_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/trx/mvcc_trx_log.cpp b/src/observer/storage/trx/mvcc_trx_log.cpp index 882b0488e..cc4edd0ad 100644 --- a/src/observer/storage/trx/mvcc_trx_log.cpp +++ b/src/observer/storage/trx/mvcc_trx_log.cpp @@ -110,7 +110,7 @@ RC MvccTrxLogHandler::commit(int32_t trx_id, int32_t commit_trx_id) log_entry.commit_trx_id = commit_trx_id; LSN lsn = 0; - RC rc = log_handler_.append( + RC rc = log_handler_.append( lsn, LogModule::Id::TRANSACTION, span(reinterpret_cast(&log_entry), sizeof(log_entry))); if (OB_FAIL(rc)) { return rc; @@ -136,7 +136,7 @@ RC MvccTrxLogHandler::rollback(int32_t trx_id) //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// MvccTrxLogReplayer::MvccTrxLogReplayer(Db &db, MvccTrxKit &trx_kit, LogHandler &log_handler) - : db_(db), trx_kit_(trx_kit), log_handler_(log_handler) + : db_(db), trx_kit_(trx_kit), log_handler_(log_handler) {} RC MvccTrxLogReplayer::replay(const LogEntry &entry) @@ -152,9 +152,9 @@ RC MvccTrxLogReplayer::replay(const LogEntry &entry) return RC::LOG_ENTRY_INVALID; } - auto *header = reinterpret_cast(entry.data()); - MvccTrx *trx = nullptr; - auto trx_iter = trx_map_.find(header->trx_id); + auto *header = reinterpret_cast(entry.data()); + MvccTrx *trx = nullptr; + auto trx_iter = trx_map_.find(header->trx_id); if (trx_iter == trx_map_.end()) { trx = static_cast(trx_kit_.create_trx(log_handler_, header->trx_id)); // trx = new MvccTrx(trx_kit_, log_handler_, header->trx_id); @@ -181,11 +181,11 @@ RC MvccTrxLogReplayer::on_done() /// 日志回放已经完成，需要把没有提交的事务，回滚掉 for (auto &pair : trx_map_) { MvccTrx *trx = pair.second; - trx->rollback(); // 恢复时的rollback，可能遇到之前已经回滚一半的事务又再次调用回滚的情况 + trx->rollback(); // 恢复时的rollback，可能遇到之前已经回滚一半的事务又再次调用回滚的情况 delete pair.second; } trx_map_.clear(); return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/trx/mvcc_trx_log.h b/src/observer/storage/trx/mvcc_trx_log.h index 240adcce4..4402bc6fb 100644 --- a/src/observer/storage/trx/mvcc_trx_log.h +++ b/src/observer/storage/trx/mvcc_trx_log.h @@ -164,4 +164,4 @@ class MvccTrxLogReplayer final : public LogReplayer ///< 事务ID到事务的映射。在重做结束后，如果还有未提交的事务，需要回滚。 unordered_map trx_map_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/trx/trx.cpp b/src/observer/storage/trx/trx.cpp index bc3244b42..40c45a310 100644 --- a/src/observer/storage/trx/trx.cpp +++ b/src/observer/storage/trx/trx.cpp @@ -25,7 +25,7 @@ See the Mulan PSL v2 for more details. */ namespace oceanbase { -TrxKit *TrxKit::create(const char *name, Db* db) +TrxKit *TrxKit::create(const char *name, Db *db) { TrxKit *trx_kit = nullptr; if (common::is_blank(name) || 0 == strcasecmp(name, "vacuous")) { @@ -45,7 +45,7 @@ TrxKit *TrxKit::create(const char *name, Db* db) delete trx_kit; trx_kit = nullptr; } - + return trx_kit; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/trx/trx.h b/src/observer/storage/trx/trx.h index fb0013505..7c19cff2c 100644 --- a/src/observer/storage/trx/trx.h +++ b/src/observer/storage/trx/trx.h @@ -162,4 +162,4 @@ class Trx private: TrxKit::Type type_; }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/trx/vacuous_trx.cpp b/src/observer/storage/trx/vacuous_trx.cpp index aa49df586..fec3a5f01 100644 --- a/src/observer/storage/trx/vacuous_trx.cpp +++ b/src/observer/storage/trx/vacuous_trx.cpp @@ -45,4 +45,4 @@ RC VacuousTrx::commit() { return RC::SUCCESS; } RC VacuousTrx::rollback() { return RC::SUCCESS; } RC VacuousTrx::redo(Db *, const LogEntry &) { return RC::SUCCESS; } -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file diff --git a/src/observer/storage/trx/vacuous_trx.h b/src/observer/storage/trx/vacuous_trx.h index 828c97ec9..c882e91e9 100644 --- a/src/observer/storage/trx/vacuous_trx.h +++ b/src/observer/storage/trx/vacuous_trx.h @@ -66,4 +66,4 @@ class VacuousTrxLogReplayer : public LogReplayer RC replay(const LogEntry &) override { return RC::SUCCESS; } }; -} \ No newline at end of file +} // namespace oceanbase \ No newline at end of file From 7de73d8541723ccafc6b0a86dc9f06d939c64640 Mon Sep 17 00:00:00 2001 From: aradhanahegde Date: Sun, 5 Oct 2025 16:50:54 -0400 Subject: [PATCH 7/7] refactor --- src/observer/net/sql_task_handler.h | 2 +- src/observer/sql/optimizer/cascade/cost_model.h | 2 +- src/observer/storage/clog/log_buffer.h | 2 +- src/observer/storage/record/heap_record_scanner.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/observer/net/sql_task_handler.h b/src/observer/net/sql_task_handler.h index d2d601be1..4197c3020 100644 --- a/src/observer/net/sql_task_handler.h +++ b/src/observer/net/sql_task_handler.h @@ -52,7 +52,7 @@ class SqlTaskHandler QueryCacheStage query_cache_stage_; /// 查询缓存阶段 ParseStage parse_stage_; /// 解析阶段。将SQL解析成语法树 ParsedSqlNode ResolveStage resolve_stage_; /// 解析阶段。将语法树解析成Stmt(statement) - OptimizeStage optimize_stage_; /// 优化阶段。将语句优化成执行计划，包含规则优化和物理优化 + OptimizeStage optimize_stage_; /// 优化阶段。将语句优化成执行计划，包含规则优化和物理优化 ExecuteStage execute_stage_; /// 执行阶段 }; } // namespace oceanbase \ No newline at end of file diff --git a/src/observer/sql/optimizer/cascade/cost_model.h b/src/observer/sql/optimizer/cascade/cost_model.h index 397165ae1..2d17e8e5e 100644 --- a/src/observer/sql/optimizer/cascade/cost_model.h +++ b/src/observer/sql/optimizer/cascade/cost_model.h @@ -29,7 +29,7 @@ class CostModel public: // TODO: support user-defined - CostModel() {}; + CostModel() {} inline double cpu_op() { return CPU_OP; } diff --git a/src/observer/storage/clog/log_buffer.h b/src/observer/storage/clog/log_buffer.h index 365894638..2cc731a1e 100644 --- a/src/observer/storage/clog/log_buffer.h +++ b/src/observer/storage/clog/log_buffer.h @@ -70,7 +70,7 @@ class LogEntryBuffer LSN flushed_lsn() const { return flushed_lsn_.load(); } private: - mutex mutex_; /// 当前数据结构一定会在多线程中访问，所以强制使用有效的锁，而不是有条件生效的common::Mutex + mutex mutex_; /// 当前数据结构一定会在多线程中访问，所以强制使用有效的锁，而不是有条件生效的common::Mutex deque entries_; /// 日志缓冲区 atomic bytes_; /// 当前缓冲区中的日志数据大小 diff --git a/src/observer/storage/record/heap_record_scanner.h b/src/observer/storage/record/heap_record_scanner.h index 79646be4d..34f6b32e7 100644 --- a/src/observer/storage/record/heap_record_scanner.h +++ b/src/observer/storage/record/heap_record_scanner.h @@ -70,7 +70,7 @@ class HeapRecordScanner : public RecordScanner DiskBufferPool *disk_buffer_pool_ = nullptr; ///< 当前访问的文件 Trx *trx_ = nullptr; ///< 当前是哪个事务在遍历 LogHandler *log_handler_ = nullptr; - ReadWriteMode rw_mode_ = ReadWriteMode::READ_WRITE; ///< 遍历出来的数据，是否可能对它做修改 + ReadWriteMode rw_mode_ = ReadWriteMode::READ_WRITE; ///< 遍历出来的数据，是否可能对它做修改 BufferPoolIterator bp_iterator_; ///< 遍历buffer pool的所有页面 ConditionFilter *condition_filter_ = nullptr; ///< 过滤record