susumu.yata
null+****@clear*****
Wed Mar 13 10:17:11 JST 2013
susumu.yata 2013-03-13 10:17:11 +0900 (Wed, 13 Mar 2013) New Revision: 24ffe9c78c7905ae3afe6a97ab87d4364f7974e9 https://github.com/groonga/grnxx/commit/24ffe9c78c7905ae3afe6a97ab87d4364f7974e9 Message: Rename grnxx::Map::scan() to grnxx::Map::open_scan(). Modified files: lib/map.cpp lib/map.hpp test/test_map.cpp Modified: lib/map.cpp (+1 -1) =================================================================== --- lib/map.cpp 2013-03-13 10:10:04 +0900 (d9d1374) +++ lib/map.cpp 2013-03-13 10:17:11 +0900 (c7e4a90) @@ -147,7 +147,7 @@ void Map::unlink(io::Pool pool, uint32_t block_id) { // TODO: Unknown type error! } -MapScan *Map::scan(const Slice &query, const Charset *charset) { +MapScan *Map::open_scan(const Slice &query, const Charset *charset) { return MapScan::open(this, query, charset); } Modified: lib/map.hpp (+1 -1) =================================================================== --- lib/map.hpp 2013-03-13 10:10:04 +0900 (a123770) +++ lib/map.hpp 2013-03-13 10:17:11 +0900 (f6f9a76) @@ -245,7 +245,7 @@ class Map { // Start scan to find keys in "query" and return an object for the scan. // The object must be deleted after the scan. - MapScan *scan(const Slice &query, const Charset *charset = nullptr); + MapScan *open_scan(const Slice &query, const Charset *charset = nullptr); // TODO }; Modified: test/test_map.cpp (+5 -3) =================================================================== --- test/test_map.cpp 2013-03-13 10:10:04 +0900 (57479f3) +++ test/test_map.cpp 2013-03-13 10:17:11 +0900 (80556f4) @@ -150,7 +150,7 @@ void test_scan() { grnxx::Slice query = "ABCDXEFG"; - std::unique_ptr<grnxx::MapScan> scan(map->scan(query)); + std::unique_ptr<grnxx::MapScan> scan(map->open_scan(query)); assert(scan->next()); assert(scan->offset() == 0); @@ -166,7 +166,8 @@ void test_scan() { assert(!scan->next()); - scan.reset(map->scan(query, grnxx::Charset::open(grnxx::CHARSET_UTF_8))); + scan.reset(map->open_scan( + query, grnxx::Charset::open(grnxx::CHARSET_UTF_8))); assert(scan->next()); assert(scan->offset() == 0); @@ -194,7 +195,8 @@ void test_scan() { query = "今日は良い天気ですね"; - scan.reset(map->scan(query, grnxx::Charset::open(grnxx::CHARSET_UTF_8))); + scan.reset(map->open_scan( + query, grnxx::Charset::open(grnxx::CHARSET_UTF_8))); assert(scan->next()); assert(scan->offset() == 0); -------------- next part -------------- HTML����������������������������...Download