From 0936d27235277c84187a8a7b8adb95e99fd77409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=BF=90=E6=9D=A5?= Date: Tue, 19 Nov 2024 18:11:44 +0800 Subject: [PATCH] fix compile bug --- src/common/lang/algorithm.h | 2 +- src/common/lang/string.h | 4 ++-- src/observer/sql/executor/sql_result.h | 8 ++++---- src/observer/sql/expr/aggregate_hash_table.h | 8 ++++---- src/observer/sql/expr/expression.h | 10 +++++----- src/observer/sql/expr/expression_tuple.h | 2 +- src/observer/sql/expr/tuple.h | 15 ++++++--------- .../operator/aggregate_vec_physical_operator.h | 6 +++--- .../sql/operator/calc_physical_operator.h | 6 +++--- .../sql/operator/explain_physical_operator.h | 2 +- .../sql/operator/expr_vec_physical_operator.h | 4 ++-- .../operator/hash_group_by_physical_operator.h | 5 ++--- .../sql/operator/insert_logical_operator.h | 4 ++-- .../sql/operator/project_physical_operator.h | 2 +- .../sql/operator/project_vec_physical_operator.h | 2 +- .../operator/scalar_group_by_physical_operator.h | 2 +- .../sql/operator/string_list_physical_operator.h | 4 ++-- src/observer/sql/optimizer/optimize_stage.h | 4 ++-- .../sql/optimizer/predicate_pushdown_rewriter.h | 3 +-- src/observer/sql/parser/expression_binder.h | 12 ++++-------- src/observer/sql/parser/lex_sql.l | 6 +++--- src/observer/sql/parser/parse_defs.h | 16 ++++++++-------- src/observer/sql/parser/yacc_sql.y | 10 +++++----- src/observer/sql/stmt/create_index_stmt.h | 8 ++++---- src/observer/sql/stmt/create_table_stmt.h | 7 +++---- src/observer/sql/stmt/load_data_stmt.h | 2 +- src/observer/sql/stmt/select_stmt.h | 6 +++--- src/observer/storage/table/table_meta.h | 4 ++-- 28 files changed, 77 insertions(+), 87 deletions(-) diff --git a/src/common/lang/algorithm.h b/src/common/lang/algorithm.h index 8039152a3..539491895 100644 --- a/src/common/lang/algorithm.h +++ b/src/common/lang/algorithm.h @@ -14,5 +14,5 @@ See the Mulan PSL v2 for more details. */ using std::max; using std::min; -using std::transform; using std::swap; +using std::transform; diff --git a/src/common/lang/string.h b/src/common/lang/string.h index d7fc1b608..dafdf7216 100644 --- a/src/common/lang/string.h +++ b/src/common/lang/string.h @@ -30,10 +30,10 @@ See the Mulan PSL v2 for more details. */ #include "common/lang/sstream.h" #include "common/lang/set.h" +using std::stof; +using std::stol; using std::string; using std::to_string; -using std::stol; -using std::stof; namespace common { diff --git a/src/observer/sql/executor/sql_result.h b/src/observer/sql/executor/sql_result.h index aed92e26d..e3ac999d5 100644 --- a/src/observer/sql/executor/sql_result.h +++ b/src/observer/sql/executor/sql_result.h @@ -43,7 +43,7 @@ class SqlResult bool has_operator() const { return operator_ != nullptr; } const TupleSchema &tuple_schema() const { return tuple_schema_; } RC return_code() const { return return_code_; } - const string &state_string() const { return state_string_; } + const string &state_string() const { return state_string_; } RC open(); RC close(); @@ -51,9 +51,9 @@ class SqlResult RC next_chunk(Chunk &chunk); private: - Session *session_ = nullptr; ///< 当前所属会话 + Session *session_ = nullptr; ///< 当前所属会话 unique_ptr operator_; ///< 执行计划 - TupleSchema tuple_schema_; ///< 返回的表头信息。可能有也可能没有 - RC return_code_ = RC::SUCCESS; + TupleSchema tuple_schema_; ///< 返回的表头信息。可能有也可能没有 + RC return_code_ = RC::SUCCESS; string state_string_; }; diff --git a/src/observer/sql/expr/aggregate_hash_table.h b/src/observer/sql/expr/aggregate_hash_table.h index f1e83bbb2..83e4d4168 100644 --- a/src/observer/sql/expr/aggregate_hash_table.h +++ b/src/observer/sql/expr/aggregate_hash_table.h @@ -96,7 +96,7 @@ class StandardAggregateHashTable : public AggregateHashTable private: /// group by values -> aggregate values - StandardHashTable aggr_values_; + StandardHashTable aggr_values_; vector aggr_types_; }; @@ -162,10 +162,10 @@ class LinearProbingAggregateHashTable : public AggregateHashTable static const int EMPTY_KEY; static const int DEFAULT_CAPACITY; - vector keys_; - vector values_; + vector keys_; + vector values_; int size_ = 0; int capacity_ = 0; AggregateExpr::Type aggregate_type_; }; -#endif // USE_SIMD +#endif // USE_SIMD diff --git a/src/observer/sql/expr/expression.h b/src/observer/sql/expr/expression.h index 4c1ee0775..af2710d8b 100644 --- a/src/observer/sql/expr/expression.h +++ b/src/observer/sql/expr/expression.h @@ -266,7 +266,7 @@ class CastExpr : public Expression private: unique_ptr child_; ///< 从这个表达式转换 - AttrType cast_type_; ///< 想要转换成这个类型 + AttrType cast_type_; ///< 想要转换成这个类型 }; /** @@ -309,7 +309,7 @@ class ComparisonExpr : public Expression RC compare_column(const Column &left, const Column &right, vector &result) const; private: - CompOp comp_; + CompOp comp_; unique_ptr left_; unique_ptr right_; }; @@ -342,7 +342,7 @@ class ConjunctionExpr : public Expression vector> &children() { return children_; } private: - Type conjunction_type_; + Type conjunction_type_; vector> children_; }; @@ -399,7 +399,7 @@ class ArithmeticExpr : public Expression RC execute_calc(const Column &left, const Column &right, Column &result, Type type, AttrType attr_type) const; private: - Type arithmetic_type_; + Type arithmetic_type_; unique_ptr left_; unique_ptr right_; }; @@ -464,6 +464,6 @@ class AggregateExpr : public Expression static RC type_from_string(const char *type_str, Type &type); private: - Type aggregate_type_; + Type aggregate_type_; unique_ptr child_; }; diff --git a/src/observer/sql/expr/expression_tuple.h b/src/observer/sql/expr/expression_tuple.h index df9dbe0bd..c70cd4fc2 100644 --- a/src/observer/sql/expr/expression_tuple.h +++ b/src/observer/sql/expr/expression_tuple.h @@ -86,5 +86,5 @@ class ExpressionTuple : public Tuple private: const vector &expressions_; - const Tuple *child_tuple_ = nullptr; + const Tuple *child_tuple_ = nullptr; }; diff --git a/src/observer/sql/expr/tuple.h b/src/observer/sql/expr/tuple.h index 0f20398e7..172ba6077 100644 --- a/src/observer/sql/expr/tuple.h +++ b/src/observer/sql/expr/tuple.h @@ -94,8 +94,8 @@ class Tuple virtual string to_string() const { - string str; - const int cell_num = this->cell_num(); + string str; + const int cell_num = this->cell_num(); for (int i = 0; i < cell_num - 1; i++) { Value cell; cell_at(i, cell); @@ -242,8 +242,8 @@ class RowTuple : public Tuple const Record &record() const { return *record_; } private: - Record *record_ = nullptr; - const Table *table_ = nullptr; + Record *record_ = nullptr; + const Table *table_ = nullptr; vector speces_; }; @@ -259,10 +259,7 @@ class ProjectTuple : public Tuple ProjectTuple() = default; virtual ~ProjectTuple() = default; - void set_expressions(vector> &&expressions) - { - expressions_ = std::move(expressions); - } + void set_expressions(vector> &&expressions) { expressions_ = std::move(expressions); } auto get_expressions() const -> const vector> & { return expressions_; } @@ -303,7 +300,7 @@ class ProjectTuple : public Tuple #endif private: vector> expressions_; - Tuple *tuple_ = nullptr; + Tuple *tuple_ = nullptr; }; /** diff --git a/src/observer/sql/operator/aggregate_vec_physical_operator.h b/src/observer/sql/operator/aggregate_vec_physical_operator.h index 2dd748a21..48c6a0e1b 100644 --- a/src/observer/sql/operator/aggregate_vec_physical_operator.h +++ b/src/observer/sql/operator/aggregate_vec_physical_operator.h @@ -68,7 +68,7 @@ class AggregateVecPhysicalOperator : public PhysicalOperator }; vector aggregate_expressions_; /// 聚合表达式 vector value_expressions_; - Chunk chunk_; - Chunk output_chunk_; - AggregateValues aggr_values_; + Chunk chunk_; + Chunk output_chunk_; + AggregateValues aggr_values_; }; diff --git a/src/observer/sql/operator/calc_physical_operator.h b/src/observer/sql/operator/calc_physical_operator.h index 19a9c55de..bb1d7d6d1 100644 --- a/src/observer/sql/operator/calc_physical_operator.h +++ b/src/observer/sql/operator/calc_physical_operator.h @@ -68,7 +68,7 @@ class CalcPhysicalOperator : public PhysicalOperator } private: - vector> expressions_; - ExpressionTuple> tuple_; - bool emitted_ = false; + vector> expressions_; + ExpressionTuple> tuple_; + bool emitted_ = false; }; diff --git a/src/observer/sql/operator/explain_physical_operator.h b/src/observer/sql/operator/explain_physical_operator.h index 0b965c3c8..8ae0bb0ea 100644 --- a/src/observer/sql/operator/explain_physical_operator.h +++ b/src/observer/sql/operator/explain_physical_operator.h @@ -46,6 +46,6 @@ class ExplainPhysicalOperator : public PhysicalOperator void generate_physical_plan(); private: - string physical_plan_; + string physical_plan_; ValueListTuple tuple_; }; diff --git a/src/observer/sql/operator/expr_vec_physical_operator.h b/src/observer/sql/operator/expr_vec_physical_operator.h index 047c8cb8c..bbd5a9a91 100644 --- a/src/observer/sql/operator/expr_vec_physical_operator.h +++ b/src/observer/sql/operator/expr_vec_physical_operator.h @@ -31,6 +31,6 @@ class ExprVecPhysicalOperator : public PhysicalOperator private: vector expressions_; /// 表达式 - Chunk chunk_; - Chunk evaled_chunk_; + Chunk chunk_; + Chunk evaled_chunk_; }; 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 d04319887..1c3919e36 100644 --- a/src/observer/sql/operator/hash_group_by_physical_operator.h +++ b/src/observer/sql/operator/hash_group_by_physical_operator.h @@ -27,8 +27,7 @@ See the Mulan PSL v2 for more details. */ class HashGroupByPhysicalOperator : public GroupByPhysicalOperator { public: - HashGroupByPhysicalOperator( - vector> &&group_by_exprs, vector &&expressions); + HashGroupByPhysicalOperator(vector> &&group_by_exprs, vector &&expressions); virtual ~HashGroupByPhysicalOperator() = default; @@ -58,5 +57,5 @@ class HashGroupByPhysicalOperator : public GroupByPhysicalOperator vector groups_; vector::iterator current_group_; - bool first_emited_ = false; /// 第一条数据是否已经输出 + bool first_emited_ = false; /// 第一条数据是否已经输出 }; diff --git a/src/observer/sql/operator/insert_logical_operator.h b/src/observer/sql/operator/insert_logical_operator.h index ea68f7cb5..1763bcd08 100644 --- a/src/observer/sql/operator/insert_logical_operator.h +++ b/src/observer/sql/operator/insert_logical_operator.h @@ -29,11 +29,11 @@ class InsertLogicalOperator : public LogicalOperator LogicalOperatorType type() const override { return LogicalOperatorType::INSERT; } - Table *table() const { return table_; } + Table *table() const { return table_; } const vector &values() const { return values_; } vector &values() { return values_; } private: - Table *table_ = nullptr; + Table *table_ = nullptr; vector values_; }; diff --git a/src/observer/sql/operator/project_physical_operator.h b/src/observer/sql/operator/project_physical_operator.h index 189328743..6f49fee19 100644 --- a/src/observer/sql/operator/project_physical_operator.h +++ b/src/observer/sql/operator/project_physical_operator.h @@ -41,6 +41,6 @@ class ProjectPhysicalOperator : public PhysicalOperator RC tuple_schema(TupleSchema &schema) const override; private: - vector> expressions_; + vector> expressions_; ExpressionTuple> tuple_; }; diff --git a/src/observer/sql/operator/project_vec_physical_operator.h b/src/observer/sql/operator/project_vec_physical_operator.h index 5d3792ffb..de3f716f6 100644 --- a/src/observer/sql/operator/project_vec_physical_operator.h +++ b/src/observer/sql/operator/project_vec_physical_operator.h @@ -37,5 +37,5 @@ class ProjectVecPhysicalOperator : public PhysicalOperator private: vector> expressions_; - Chunk chunk_; + Chunk chunk_; }; 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 542bf9657..9f83a54f8 100644 --- a/src/observer/sql/operator/scalar_group_by_physical_operator.h +++ b/src/observer/sql/operator/scalar_group_by_physical_operator.h @@ -36,5 +36,5 @@ class ScalarGroupByPhysicalOperator : public GroupByPhysicalOperator private: unique_ptr group_value_; - bool emitted_ = false; /// 标识是否已经输出过 + bool emitted_ = false; /// 标识是否已经输出过 }; diff --git a/src/observer/sql/operator/string_list_physical_operator.h b/src/observer/sql/operator/string_list_physical_operator.h index 609238c7f..038aa0bea 100644 --- a/src/observer/sql/operator/string_list_physical_operator.h +++ b/src/observer/sql/operator/string_list_physical_operator.h @@ -70,8 +70,8 @@ class StringListPhysicalOperator : public PhysicalOperator return nullptr; } - const StringList &string_list = *iterator_; - vector cells; + const StringList &string_list = *iterator_; + vector cells; for (const string &s : string_list) { Value value(s.c_str()); diff --git a/src/observer/sql/optimizer/optimize_stage.h b/src/observer/sql/optimizer/optimize_stage.h index 9d69e28c2..83c0f9739 100644 --- a/src/observer/sql/optimizer/optimize_stage.h +++ b/src/observer/sql/optimizer/optimize_stage.h @@ -71,8 +71,8 @@ class OptimizeStage * 而物理计划描述怎么做，比如如何从某张表按照什么条件获取什么数据，是否使用索引，使用哪个索引等。 * @param physical_operator 生成的物理计划。通常是一个多叉树的形状，这里就拿着根节点就可以了。 */ - RC generate_physical_plan(unique_ptr &logical_operator, - unique_ptr &physical_operator, Session *session); + RC generate_physical_plan( + unique_ptr &logical_operator, unique_ptr &physical_operator, Session *session); private: LogicalPlanGenerator logical_plan_generator_; ///< 根据SQL生成逻辑计划 diff --git a/src/observer/sql/optimizer/predicate_pushdown_rewriter.h b/src/observer/sql/optimizer/predicate_pushdown_rewriter.h index 1231b6690..5fbc4510a 100644 --- a/src/observer/sql/optimizer/predicate_pushdown_rewriter.h +++ b/src/observer/sql/optimizer/predicate_pushdown_rewriter.h @@ -31,7 +31,6 @@ class PredicatePushdownRewriter : public RewriteRule RC rewrite(unique_ptr &oper, bool &change_made) override; private: - RC get_exprs_can_pushdown( - unique_ptr &expr, vector> &pushdown_exprs); + RC get_exprs_can_pushdown(unique_ptr &expr, vector> &pushdown_exprs); bool is_empty_predicate(unique_ptr &expr); }; diff --git a/src/observer/sql/parser/expression_binder.h b/src/observer/sql/parser/expression_binder.h index 103e63c97..9a5e7c9cd 100644 --- a/src/observer/sql/parser/expression_binder.h +++ b/src/observer/sql/parser/expression_binder.h @@ -45,16 +45,12 @@ class ExpressionBinder RC bind_expression(unique_ptr &expr, vector> &bound_expressions); private: - RC bind_star_expression( - unique_ptr &star_expr, vector> &bound_expressions); + RC bind_star_expression(unique_ptr &star_expr, vector> &bound_expressions); RC bind_unbound_field_expression( unique_ptr &unbound_field_expr, vector> &bound_expressions); - RC bind_field_expression( - unique_ptr &field_expr, vector> &bound_expressions); - RC bind_value_expression( - unique_ptr &value_expr, vector> &bound_expressions); - RC bind_cast_expression( - unique_ptr &cast_expr, vector> &bound_expressions); + RC bind_field_expression(unique_ptr &field_expr, vector> &bound_expressions); + RC bind_value_expression(unique_ptr &value_expr, vector> &bound_expressions); + RC bind_cast_expression(unique_ptr &cast_expr, vector> &bound_expressions); RC bind_comparison_expression( unique_ptr &comparison_expr, vector> &bound_expressions); RC bind_conjunction_expression( diff --git a/src/observer/sql/parser/lex_sql.l b/src/observer/sql/parser/lex_sql.l index 2e8225b97..ed028d048 100644 --- a/src/observer/sql/parser/lex_sql.l +++ b/src/observer/sql/parser/lex_sql.l @@ -119,7 +119,7 @@ GROUP RETURN_TOKEN(GROUP); BY RETURN_TOKEN(BY); STORAGE RETURN_TOKEN(STORAGE); FORMAT RETURN_TOKEN(FORMAT); -{ID} yylval->string=strdup(yytext); RETURN_TOKEN(ID); +{ID} yylval->cstring=strdup(yytext); RETURN_TOKEN(ID); "(" RETURN_TOKEN(LBRACE); ")" RETURN_TOKEN(RBRACE); @@ -136,8 +136,8 @@ FORMAT RETURN_TOKEN(FORMAT); "-" | "*" | "/" { return yytext[0]; } -\"[^"]*\" yylval->string = strdup(yytext); RETURN_TOKEN(SSS); -'[^']*\' yylval->string = strdup(yytext); RETURN_TOKEN(SSS); +\"[^"]*\" yylval->cstring = strdup(yytext); RETURN_TOKEN(SSS); +'[^']*\' yylval->cstring = strdup(yytext); RETURN_TOKEN(SSS); . LOG_DEBUG("Unknown character [%c]",yytext[0]); return yytext[0]; %% diff --git a/src/observer/sql/parser/parse_defs.h b/src/observer/sql/parser/parse_defs.h index 4acbf4ecd..119237f35 100644 --- a/src/observer/sql/parser/parse_defs.h +++ b/src/observer/sql/parser/parse_defs.h @@ -89,7 +89,7 @@ struct SelectSqlNode { vector> expressions; ///< 查询的表达式 vector relations; ///< 查询的表 - vector conditions; ///< 查询条件，使用AND串联起来多个条件 + vector conditions; ///< 查询条件，使用AND串联起来多个条件 vector> group_by; ///< group by clause }; @@ -131,7 +131,7 @@ struct UpdateSqlNode { string relation_name; ///< Relation to update string attribute_name; ///< 更新的字段，仅支持一个字段 - Value value; ///< 更新的值，仅支持一个字段 + Value value; ///< 更新的值，仅支持一个字段 vector conditions; }; @@ -142,9 +142,9 @@ struct UpdateSqlNode */ struct AttrInfoSqlNode { - AttrType type; ///< Type of attribute - string name; ///< Attribute name - size_t length; ///< Length of attribute + AttrType type; ///< Type of attribute + string name; ///< Attribute name + size_t length; ///< Length of attribute }; /** @@ -220,7 +220,7 @@ struct LoadDataSqlNode struct SetVariableSqlNode { string name; - Value value; + Value value; }; class ParsedSqlNode; @@ -245,8 +245,8 @@ struct ExplainSqlNode struct ErrorSqlNode { string error_msg; - int line; - int column; + int line; + int column; }; /** diff --git a/src/observer/sql/parser/yacc_sql.y b/src/observer/sql/parser/yacc_sql.y index 3cb83c029..786879000 100644 --- a/src/observer/sql/parser/yacc_sql.y +++ b/src/observer/sql/parser/yacc_sql.y @@ -127,15 +127,15 @@ UnboundAggregateExpr *create_aggregate_expression(const char *aggregate_name, vector * condition_list; vector * rel_attr_list; vector * relation_list; - char * string; + char * cstring; int number; float floats; } %token NUMBER %token FLOAT -%token ID -%token SSS +%token ID +%token SSS //非终结符 /** type 定义了各种解析后的结果输出的是什么类型。类型对应了 union 中的定义的成员变量名称 **/ @@ -143,7 +143,7 @@ UnboundAggregateExpr *create_aggregate_expression(const char *aggregate_name, %type condition %type value %type number -%type relation +%type relation %type comp_op %type rel_attr %type attr_def_list @@ -151,7 +151,7 @@ UnboundAggregateExpr *create_aggregate_expression(const char *aggregate_name, %type value_list %type where %type condition_list -%type storage_format +%type storage_format %type rel_list %type expression %type expression_list diff --git a/src/observer/sql/stmt/create_index_stmt.h b/src/observer/sql/stmt/create_index_stmt.h index 6d9d42aca..cbdd8f4d1 100644 --- a/src/observer/sql/stmt/create_index_stmt.h +++ b/src/observer/sql/stmt/create_index_stmt.h @@ -35,9 +35,9 @@ class CreateIndexStmt : public Stmt StmtType type() const override { return StmtType::CREATE_INDEX; } - Table *table() const { return table_; } - const FieldMeta *field_meta() const { return field_meta_; } - const string &index_name() const { return index_name_; } + Table *table() const { return table_; } + const FieldMeta *field_meta() const { return field_meta_; } + const string &index_name() const { return index_name_; } public: static RC create(Db *db, const CreateIndexSqlNode &create_index, Stmt *&stmt); @@ -45,5 +45,5 @@ class CreateIndexStmt : public Stmt private: Table *table_ = nullptr; const FieldMeta *field_meta_ = nullptr; - string index_name_; + string index_name_; }; diff --git a/src/observer/sql/stmt/create_table_stmt.h b/src/observer/sql/stmt/create_table_stmt.h index 4b66f8867..aed632d18 100644 --- a/src/observer/sql/stmt/create_table_stmt.h +++ b/src/observer/sql/stmt/create_table_stmt.h @@ -28,8 +28,7 @@ class Db; class CreateTableStmt : public Stmt { public: - CreateTableStmt( - const string &table_name, const vector &attr_infos, StorageFormat storage_format) + CreateTableStmt(const string &table_name, const vector &attr_infos, StorageFormat storage_format) : table_name_(table_name), attr_infos_(attr_infos), storage_format_(storage_format) {} virtual ~CreateTableStmt() = default; @@ -38,7 +37,7 @@ class CreateTableStmt : public Stmt const string &table_name() const { return table_name_; } const vector &attr_infos() const { return attr_infos_; } - const StorageFormat storage_format() const { return storage_format_; } + const StorageFormat storage_format() const { return storage_format_; } static RC create(Db *db, const CreateTableSqlNode &create_table, Stmt *&stmt); static StorageFormat get_storage_format(const char *format_str); @@ -46,5 +45,5 @@ class CreateTableStmt : public Stmt private: string table_name_; vector attr_infos_; - StorageFormat storage_format_; + StorageFormat storage_format_; }; diff --git a/src/observer/sql/stmt/load_data_stmt.h b/src/observer/sql/stmt/load_data_stmt.h index 995d1c525..1308159b7 100644 --- a/src/observer/sql/stmt/load_data_stmt.h +++ b/src/observer/sql/stmt/load_data_stmt.h @@ -32,6 +32,6 @@ class LoadDataStmt : public Stmt static RC create(Db *db, const LoadDataSqlNode &load_data, Stmt *&stmt); private: - Table *table_ = nullptr; + Table *table_ = nullptr; string filename_; }; diff --git a/src/observer/sql/stmt/select_stmt.h b/src/observer/sql/stmt/select_stmt.h index 9d4c8fd7d..5a736d9d0 100644 --- a/src/observer/sql/stmt/select_stmt.h +++ b/src/observer/sql/stmt/select_stmt.h @@ -40,14 +40,14 @@ class SelectStmt : public Stmt public: const vector &tables() const { return tables_; } - FilterStmt *filter_stmt() const { return filter_stmt_; } + FilterStmt *filter_stmt() const { return filter_stmt_; } vector> &query_expressions() { return query_expressions_; } vector> &group_by() { return group_by_; } private: vector> query_expressions_; - vector
tables_; - FilterStmt *filter_stmt_ = nullptr; + vector
tables_; + FilterStmt *filter_stmt_ = nullptr; vector> group_by_; }; diff --git a/src/observer/storage/table/table_meta.h b/src/observer/storage/table/table_meta.h index 33b94e2f0..61a6c0dfe 100644 --- a/src/observer/storage/table/table_meta.h +++ b/src/observer/storage/table/table_meta.h @@ -69,12 +69,12 @@ class TableMeta : public common::Serializable void desc(ostream &os) const; protected: - int32_t table_id_ = -1; + int32_t table_id_ = -1; string name_; vector trx_fields_; vector fields_; // 包含sys_fields vector indexes_; - StorageFormat storage_format_; + StorageFormat storage_format_; int record_size_ = 0; };