susumu.yata
null+****@clear*****
Fri Jul 4 18:12:50 JST 2014
susumu.yata 2014-07-04 18:12:50 +0900 (Fri, 04 Jul 2014) New Revision: bf6b729edf2cc30332b360cc5f58e4abde996068 https://github.com/groonga/grnxx/commit/bf6b729edf2cc30332b360cc5f58e4abde996068 Message: Remove an argument "error" from Table::get_column(). Modified files: include/grnxx/table.hpp lib/grnxx/table.cpp test/test_grnxx.cpp Modified: include/grnxx/table.hpp (+5 -1) =================================================================== --- include/grnxx/table.hpp 2014-07-04 18:11:13 +0900 (eb167ad) +++ include/grnxx/table.hpp 2014-07-04 18:12:50 +0900 (701f065) @@ -81,10 +81,14 @@ class Table { // Get a column identified by "column_id". // + // If "column_id" is invalid, the result is undefined. + // // Returns a pointer to the column on success. // On failure, returns nullptr and stores error information into "*error" if // "error" != nullptr. - Column *get_column(Error *error, size_t column_id) const; + Column *get_column(size_t column_id) const { + return columns_[column_id].get(); + } // Find a column named "name". // Modified: lib/grnxx/table.cpp (+0 -9) =================================================================== --- lib/grnxx/table.cpp 2014-07-04 18:11:13 +0900 (16e26f2) +++ lib/grnxx/table.cpp 2014-07-04 18:12:50 +0900 (89b13c9) @@ -96,15 +96,6 @@ bool Table::reorder_column(Error *error, return true; } -Column *Table::get_column(Error *error, size_t column_id) const { - if (column_id >= num_columns()) { - GRNXX_ERROR_SET(error, NOT_FOUND, - "Column not found: column_id = %" PRIi64, column_id); - return nullptr; - } - return columns_[column_id].get(); -} - Column *Table::find_column(Error *error, String name) const { for (size_t column_id = 0; column_id < num_columns(); ++column_id) { if (name == columns_[column_id]->name()) { Modified: test/test_grnxx.cpp (+12 -12) =================================================================== --- test/test_grnxx.cpp 2014-07-04 18:11:13 +0900 (2842036) +++ test/test_grnxx.cpp 2014-07-04 18:12:50 +0900 (513f3c0) @@ -90,7 +90,7 @@ void test_table() { assert(column->name() == "Column_1"); assert(table->num_columns() == 1); - assert(table->get_column(&error, 0) == column); + assert(table->get_column(0) == column); assert(table->find_column(&error, "Column_1") == column); assert(!table->create_column(&error, "Column_1", grnxx::BOOL_DATA, @@ -105,26 +105,26 @@ void test_table() { assert(table->remove_column(&error, "Column_2")); assert(table->num_columns() == 2); - assert(table->get_column(&error, 0)->name() == "Column_1"); - assert(table->get_column(&error, 1)->name() == "Column_3"); + assert(table->get_column(0)->name() == "Column_1"); + assert(table->get_column(1)->name() == "Column_3"); assert(table->create_column(&error, "Column_2", grnxx::BOOL_DATA, grnxx::ColumnOptions())); assert(table->reorder_column(&error, "Column_3", "Column_2")); - assert(table->get_column(&error, 0)->name() == "Column_1"); - assert(table->get_column(&error, 1)->name() == "Column_2"); - assert(table->get_column(&error, 2)->name() == "Column_3"); + assert(table->get_column(0)->name() == "Column_1"); + assert(table->get_column(1)->name() == "Column_2"); + assert(table->get_column(2)->name() == "Column_3"); assert(table->reorder_column(&error, "Column_3", "")); - assert(table->get_column(&error, 0)->name() == "Column_3"); - assert(table->get_column(&error, 1)->name() == "Column_1"); - assert(table->get_column(&error, 2)->name() == "Column_2"); + assert(table->get_column(0)->name() == "Column_3"); + assert(table->get_column(1)->name() == "Column_1"); + assert(table->get_column(2)->name() == "Column_2"); assert(table->reorder_column(&error, "Column_2", "Column_3")); - assert(table->get_column(&error, 0)->name() == "Column_3"); - assert(table->get_column(&error, 1)->name() == "Column_2"); - assert(table->get_column(&error, 2)->name() == "Column_1"); + assert(table->get_column(0)->name() == "Column_3"); + assert(table->get_column(1)->name() == "Column_2"); + assert(table->get_column(2)->name() == "Column_1"); // TODO: set_key_column(), unset_key_column(). -------------- next part -------------- HTML����������������������������...Download