diff --git a/src/catalog/column.cpp b/src/catalog/column.cpp index 48efc98ddfa..50406bef954 100644 --- a/src/catalog/column.cpp +++ b/src/catalog/column.cpp @@ -34,7 +34,6 @@ void Column::SetInlined() { switch (column_type) { case type::TypeId::VARCHAR: case type::TypeId::VARBINARY: - is_inlined = false; break; // No change of inlined setting default: diff --git a/src/planner/alter_plan.cpp b/src/planner/alter_plan.cpp index ecebaa2a235..62d7dd4e5cc 100644 --- a/src/planner/alter_plan.cpp +++ b/src/planner/alter_plan.cpp @@ -30,8 +30,10 @@ AlterPlan::AlterPlan( database_name(database_name), dropped_columns(dropped_columns), type(a_type) { - this->added_columns = std::unique_ptr(new catalog::Schema(*added_columns)); - this->changed_type_columns = std::unique_ptr(new catalog::Schema(*changed_type_columns)); + this->added_columns = + std::unique_ptr(new catalog::Schema(*added_columns)); + this->changed_type_columns = std::unique_ptr( + new catalog::Schema(*changed_type_columns)); } AlterPlan::AlterPlan(const std::string &database_name, @@ -85,17 +87,17 @@ AlterPlan::AlterPlan(parser::AlterTableStatement *parse_tree) { } columns.emplace_back(column); } - added_columns = std::unique_ptr(new catalog::Schema(columns)); + added_columns = + std::unique_ptr(new catalog::Schema(columns)); columns.clear(); // deal with change column types for (size_t i = 0; i < (*parse_tree->changed_type_columns).size(); i++) { auto &tmp = (*parse_tree->changed_type_columns)[i]; - type::TypeId val = parser::ColumnDefinition::GetValueType(tmp.get()->type); - bool is_inline = (val == type::TypeId::VARCHAR) ? false : true; + type::TypeId val = + parser::ColumnDefinition::GetValueType(tmp.get()->type); auto column = catalog::Column( val, type::Type::GetTypeSize(val), - std::string((*parse_tree->changed_type_columns)[i].get()->name), - is_inline); + std::string((*parse_tree->changed_type_columns)[i].get()->name)); if ((*parse_tree->changed_type_columns)[i].get()->not_null) { catalog::Constraint constraint(ConstraintType::NOTNULL, "con_not_null"); @@ -103,7 +105,8 @@ AlterPlan::AlterPlan(parser::AlterTableStatement *parse_tree) { } columns.emplace_back(column); } - changed_type_columns = std::unique_ptr(new catalog::Schema(columns)); + changed_type_columns = + std::unique_ptr(new catalog::Schema(columns)); break; } default: