susumu.yata
null+****@clear*****
Tue Dec 16 10:41:16 JST 2014
susumu.yata 2014-11-06 08:41:17 +0900 (Thu, 06 Nov 2014) New Revision: 9371b921de4403fd797beb7929e784f7af24b6c0 https://github.com/groonga/grnxx/commit/9371b921de4403fd797beb7929e784f7af24b6c0 Message: Rename has_key_attribute() to is_key(). Modified files: lib/grnxx/impl/column/base.cpp lib/grnxx/impl/column/base.hpp lib/grnxx/impl/table.cpp Modified: lib/grnxx/impl/column/base.cpp (+1 -1) =================================================================== --- lib/grnxx/impl/column/base.cpp 2014-11-06 08:39:26 +0900 (d9de2c6) +++ lib/grnxx/impl/column/base.cpp 2014-11-06 08:41:17 +0900 (48cca51) @@ -17,7 +17,7 @@ ColumnBase::ColumnBase(Table *table, name_(name), data_type_(data_type), reference_table_(reference_table), - has_key_attribute_(false) {} + is_key_(false) {} ColumnBase::~ColumnBase() {} Modified: lib/grnxx/impl/column/base.hpp (+3 -3) =================================================================== --- lib/grnxx/impl/column/base.hpp 2014-11-06 08:39:26 +0900 (73a8613) +++ lib/grnxx/impl/column/base.hpp 2014-11-06 08:41:17 +0900 (4c70aaa) @@ -35,8 +35,8 @@ class ColumnBase : public ColumnInterface { return data_type_; } TableInterface *reference_table() const; - bool has_key_attribute() const { - return has_key_attribute_; + bool is_key() const { + return is_key_; } size_t num_indexes() const { return indexes_.size(); @@ -116,7 +116,7 @@ class ColumnBase : public ColumnInterface { String name_; DataType data_type_; Table *reference_table_; - bool has_key_attribute_; + bool is_key_; Array<std::unique_ptr<Index>> indexes_; // // Initialize the base members. Modified: lib/grnxx/impl/table.cpp (+1 -1) =================================================================== --- lib/grnxx/impl/table.cpp 2014-11-06 08:39:26 +0900 (5678cdc) +++ lib/grnxx/impl/table.cpp 2014-11-06 08:41:17 +0900 (1c08550) @@ -385,7 +385,7 @@ void Table::remove_row(Int row_id) { } // TODO: Check removability. for (size_t i = 0; i < referrer_columns_.size(); ++i) { - if (referrer_columns_[i]->has_key_attribute()) { + if (referrer_columns_[i]->is_key()) { throw "Reffered to from a key column"; // TODO } } -------------- next part -------------- HTML����������������������������...다운로드
