Navigation Menu

Skip to content

Commit

Permalink
Change the order of arguments.
Browse files Browse the repository at this point in the history
  • Loading branch information
@s-yata
s-yata committed Jun 6, 2013
1 parent 1978b5f commit 5379a50
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 54 deletions.
4 changes: 2 additions & 2 deletions lib/grnxx/map.cpp
View file
Expand Up @@ -64,8 +64,8 @@ template <typename T>
Map<T>::~Map() {}

template <typename T>
Map<T> *Map<T>::create(MapType type, Storage *storage,
uint32_t storage_node_id, const MapOptions &options) {
Map<T> *Map<T>::create(Storage *storage, uint32_t storage_node_id,
MapType type, const MapOptions &options) {
if (!storage) {
GRNXX_ERROR() << "invalid argument: storage == nullptr";
return nullptr;
Expand Down
4 changes: 2 additions & 2 deletions lib/grnxx/map.hpp
View file
Expand Up @@ -62,8 +62,8 @@ class Map {
virtual ~Map();

// Create a map.
static Map *create(MapType type, Storage *storage, uint32_t storage_node_id,
const MapOptions &options = MapOptions());
static Map *create(Storage *storage, uint32_t storage_node_id,
MapType type, const MapOptions &options = MapOptions());
// Open a map.
static Map *open(Storage *storage, uint32_t storage_node_id);

Expand Down
102 changes: 52 additions & 50 deletions test/test_map.cpp
View file
Expand Up @@ -365,17 +365,17 @@ template <typename T>
void test_map_create(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
}

template <typename T>
void test_map_open(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
const std::uint32_t storage_node_id = map->storage_node_id();
map.reset(grnxx::Map<T>::open(storage.get(), storage_node_id));
Expand All @@ -386,8 +386,8 @@ template <typename T>
void test_map_unlink(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
grnxx::StorageNode storage_node = storage->open_node(map->storage_node_id());
assert(storage_node);
Expand All @@ -399,8 +399,8 @@ template <typename T>
void test_map_type(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
assert(map->type() == map_type);
}
Expand All @@ -409,8 +409,8 @@ template <typename T>
void test_map_storage_node_id(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
grnxx::StorageNode storage_node = storage->open_node(map->storage_node_id());
assert(storage_node);
Expand All @@ -421,8 +421,8 @@ template <typename T>
void test_map_min_key_id(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
assert(map->min_key_id() == grnxx::MAP_MIN_KEY_ID);
assert(map->add(generate_random_key<T>()));
Expand All @@ -435,8 +435,8 @@ template <typename T>
void test_map_max_key_id(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
assert(map->max_key_id() == (grnxx::MAP_MIN_KEY_ID - 1));
assert(map->add(generate_random_key<T>()));
Expand All @@ -449,8 +449,8 @@ template <typename T>
void test_map_num_keys(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
assert(map->num_keys() == 0);
assert(map->add(generate_random_key<T>()));
Expand All @@ -463,8 +463,8 @@ template <typename T>
void test_map_get(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
std::vector<T> keys;
generate_random_keys(MAP_NUM_KEYS, &keys);
Expand All @@ -485,8 +485,8 @@ template <typename T>
void test_map_get_next(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
std::int64_t key_id;
std::vector<T> keys;
Expand Down Expand Up @@ -522,8 +522,8 @@ template <typename T>
void test_map_unset(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
std::vector<T> keys;
generate_random_keys(MAP_NUM_KEYS, &keys);
Expand All @@ -543,8 +543,8 @@ template <typename T>
void test_map_reset(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
std::vector<T> keys;
generate_random_keys(MAP_NUM_KEYS, &keys);
Expand All @@ -568,8 +568,8 @@ template <typename T>
void test_map_find(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
std::vector<T> keys;
generate_random_keys(MAP_NUM_KEYS, &keys);
Expand All @@ -589,8 +589,8 @@ template <typename T>
void test_map_add(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
std::vector<T> keys;
generate_random_keys(MAP_NUM_KEYS, &keys);
Expand All @@ -607,8 +607,8 @@ template <typename T>
void test_map_remove(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
std::vector<T> keys;
generate_random_keys(MAP_NUM_KEYS, &keys);
Expand All @@ -628,8 +628,8 @@ template <typename T>
void test_map_replace(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
std::vector<T> keys;
generate_random_keys(MAP_NUM_KEYS, &keys);
Expand Down Expand Up @@ -659,8 +659,9 @@ template <>
void test_map_find_longest_prefix_match<grnxx::Bytes>(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<grnxx::Bytes>> map(
grnxx::Map<grnxx::Bytes>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<grnxx::Bytes>::create(storage.get(),
grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
std::vector<grnxx::Bytes> keys;
generate_random_keys(MAP_NUM_KEYS, &keys);
Expand All @@ -681,8 +682,8 @@ template <typename T>
void test_map_truncate(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
std::vector<T> keys;
generate_random_keys(MAP_NUM_KEYS, &keys);
Expand All @@ -702,8 +703,8 @@ template <typename T>
void test_map_all_keys(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);

map->all_keys();
Expand All @@ -713,8 +714,8 @@ template <typename T>
void test_map_key_id(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
constexpr std::int64_t min = 10;
constexpr std::int64_t max = 100;
Expand Down Expand Up @@ -744,8 +745,8 @@ template <typename T>
void test_map_key(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
const T min = generate_random_key<T>();
const T max = generate_random_key<T>();
Expand Down Expand Up @@ -775,8 +776,8 @@ template <typename T>
void test_map_create_all_keys_cursor(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
std::unique_ptr<grnxx::MapCursor<T>> cursor;

Expand All @@ -788,8 +789,8 @@ template <typename T>
void test_map_create_key_id_range_cursor(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
constexpr std::int64_t min = 10;
constexpr std::int64_t max = 100;
Expand Down Expand Up @@ -844,8 +845,8 @@ template <typename T>
void test_map_create_key_range_cursor(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<T>> map(
grnxx::Map<T>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<T>::create(storage.get(), grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
const T min = generate_random_key<T>();
const T max = generate_random_key<T>();
Expand Down Expand Up @@ -910,8 +911,9 @@ template <>
void test_map_create_scanner<grnxx::Bytes>(grnxx::MapType map_type) {
std::unique_ptr<grnxx::Storage> storage(grnxx::Storage::create(nullptr));
std::unique_ptr<grnxx::Map<grnxx::Bytes>> map(
grnxx::Map<grnxx::Bytes>::create(map_type, storage.get(),
grnxx::STORAGE_ROOT_NODE_ID));
grnxx::Map<grnxx::Bytes>::create(storage.get(),
grnxx::STORAGE_ROOT_NODE_ID,
map_type));
assert(map);
const grnxx::Bytes text = generate_random_text<grnxx::Bytes>();
std::unique_ptr<grnxx::MapScanner<grnxx::Bytes>> scanner;
Expand Down

0 comments on commit 5379a50

Please sign in to comment.