susumu.yata
null+****@clear*****
Mon Jun 17 17:41:21 JST 2013
susumu.yata 2013-06-17 17:41:21 +0900 (Mon, 17 Jun 2013) New Revision: 3e37e1c01b9b8d977a525cd8feefb9bd48acad3c https://github.com/groonga/grnxx/commit/3e37e1c01b9b8d977a525cd8feefb9bd48acad3c Message: Remove a using from KeyStore<T> to KeyArray. Modified files: lib/grnxx/map/hash_table.cpp lib/grnxx/map/hash_table.hpp Modified: lib/grnxx/map/hash_table.cpp (+2 -2) =================================================================== --- lib/grnxx/map/hash_table.cpp 2013-06-17 17:39:55 +0900 (537e839) +++ lib/grnxx/map/hash_table.cpp 2013-06-17 17:41:21 +0900 (7feafeb) @@ -330,7 +330,7 @@ bool HashTable<T>::create_map(Storage *storage, uint32_t storage_node_id, *header_ = Header(); key_ids_.reset(KeyIDArray::create(storage, storage_node_id_, KeyIDArray::page_size() - 1)); - keys_.reset(KeyArray::create(storage, storage_node_id_)); + keys_.reset(KeyStore<T>::create(storage, storage_node_id_)); if (!key_ids_ || !keys_) { storage->unlink_node(storage_node_id_); return false; @@ -355,7 +355,7 @@ bool HashTable<T>::open_map(Storage *storage, uint32_t storage_node_id) { storage_node_id_ = storage_node_id; header_ = static_cast<Header *>(storage_node.body()); key_ids_.reset(KeyIDArray::open(storage, header_->key_ids_storage_node_id)); - keys_.reset(KeyArray::open(storage, header_->keys_storage_node_id)); + keys_.reset(KeyStore<T>::open(storage, header_->keys_storage_node_id)); if (!key_ids_ || !keys_) { return false; } Modified: lib/grnxx/map/hash_table.hpp (+1 -2) =================================================================== --- lib/grnxx/map/hash_table.hpp 2013-06-17 17:39:55 +0900 (b21a276) +++ lib/grnxx/map/hash_table.hpp 2013-06-17 17:41:21 +0900 (b335a91) @@ -42,7 +42,6 @@ template <typename T> class HashTable : public Map<T> { using Header = hash_table::Header; using KeyIDArray = typename hash_table::KeyIDArray<T>; - using KeyArray = KeyStore<T>; public: using Key = typename Map<T>::Key; @@ -79,7 +78,7 @@ class HashTable : public Map<T> { Header *header_; std::unique_ptr<KeyIDArray> key_ids_; std::unique_ptr<KeyIDArray> old_key_ids_; - std::unique_ptr<KeyArray> keys_; + std::unique_ptr<KeyStore<T>> keys_; bool create_map(Storage *storage, uint32_t storage_node_id, const MapOptions &options); -------------- next part -------------- HTML����������������������������...Download