susumu.yata
null+****@clear*****
Mon Jul 22 14:39:24 JST 2013
susumu.yata 2013-07-22 14:39:24 +0900 (Mon, 22 Jul 2013) New Revision: 173436435c851403a162498b144ad46ba5698fad https://github.com/groonga/grnxx/commit/173436435c851403a162498b144ad46ba5698fad Message: Remove an obsolete file (key_id_array.hpp). Removed files: lib/grnxx/map/hash_table/key_id_array.hpp Modified files: lib/grnxx/map/hash_table/Makefile.am lib/grnxx/map/hash_table/dummy.cpp Modified: lib/grnxx/map/hash_table/Makefile.am (+1 -2) =================================================================== --- lib/grnxx/map/hash_table/Makefile.am 2013-07-22 14:37:02 +0900 (28ad000) +++ lib/grnxx/map/hash_table/Makefile.am 2013-07-22 14:39:24 +0900 (775a8a4) @@ -10,5 +10,4 @@ libgrnxx_map_hash_table_includedir = ${includedir}/grnxx/map/hash_table libgrnxx_map_hash_table_include_HEADERS = \ dummy.hpp \ hash.hpp \ - header.hpp \ - key_id_array.hpp + header.hpp Modified: lib/grnxx/map/hash_table/dummy.cpp (+0 -1) =================================================================== --- lib/grnxx/map/hash_table/dummy.cpp 2013-07-22 14:37:02 +0900 (de9cf16) +++ lib/grnxx/map/hash_table/dummy.cpp 2013-07-22 14:39:24 +0900 (6aefa8a) @@ -18,7 +18,6 @@ #include "grnxx/map/hash_table/dummy.hpp" #include "grnxx/map/hash_table/hash.hpp" -#include "grnxx/map/hash_table/key_id_array.hpp" namespace grnxx { namespace map { Deleted: lib/grnxx/map/hash_table/key_id_array.hpp (+0 -192) 100644 =================================================================== --- lib/grnxx/map/hash_table/key_id_array.hpp 2013-07-22 14:37:02 +0900 (b80a1d8) +++ /dev/null @@ -1,192 +0,0 @@ -/* - Copyright (C) 2013 Brazil, Inc. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ -#ifndef GRNXX_MAP_HASH_TABLE_KEY_ID_ARRAY_HPP -#define GRNXX_MAP_HASH_TABLE_KEY_ID_ARRAY_HPP - -#include "grnxx/features.hpp" - -#include "grnxx/array_impl.hpp" -#include "grnxx/exception.hpp" -#include "grnxx/logger.hpp" -#include "grnxx/map.hpp" -#include "grnxx/storage.hpp" -#include "grnxx/types.hpp" - -namespace grnxx { -namespace map { -namespace hash_table { - -// Change the array size based on the size of "T". -// Note that the size of link array is N/64 where N is the size of BitArray. -template <typename T, size_t T_SIZE = sizeof(T)> -struct KeyIDArrayHelper; - -// Map<T> has at most 2^40 different keys. -template <typename T, size_t T_SIZE> -struct KeyIDArrayHelper { - using ImplType = ArrayImpl<int64_t, 65536, 8192>; - static constexpr uint64_t SIZE = 1ULL << 41; - static constexpr uint64_t PAGE_SIZE = 1ULL << 16; -}; - -// Map<T> has at most 2^8 different keys. -template <typename T> -struct KeyIDArrayHelper<T, 1> { - using ImplType = ArrayImpl<int64_t, 0, 0>; - static constexpr uint64_t SIZE = 1ULL << 9; - static constexpr uint64_t PAGE_SIZE = SIZE; -}; - -// Map<T> has at most 2^16 different keys. -template <typename T> -struct KeyIDArrayHelper<T, 2> { - using ImplType = ArrayImpl<int64_t, 512, 0>; - static constexpr uint64_t SIZE = 1ULL << 17; - static constexpr uint64_t PAGE_SIZE = 1ULL << 9; -}; - -// Map<T> has at most 2^32 different keys. -template <typename T> -struct KeyIDArrayHelper<T, 4> { - using ImplType = ArrayImpl<int64_t, 65536, 512>; - static constexpr uint64_t SIZE = 1ULL << 33; - static constexpr uint64_t PAGE_SIZE = 1ULL << 16; -}; - -struct KeyIDArrayHeader { - uint32_t impl_storage_node_id; - uint32_t reserved; - uint64_t mask; - - KeyIDArrayHeader() - : impl_storage_node_id(STORAGE_INVALID_NODE_ID), - reserved(0), - mask(0) {} -}; - -template <typename T> -class KeyIDArray { - using ArrayImpl = typename KeyIDArrayHelper<T>::ImplType; - - public: - using Value = typename ArrayImpl::Value; - using ValueArg = typename ArrayImpl::ValueArg; - - KeyIDArray() - : storage_(nullptr), - storage_node_id_(STORAGE_INVALID_NODE_ID), - header_(nullptr), - impl_(), - mask_(0) {} - ~KeyIDArray() {} - - // Create a table. - static KeyIDArray *create(Storage *storage, uint32_t storage_node_id, - uint64_t mask) { - std::unique_ptr<KeyIDArray> array(create_instance()); - array->create_array(storage, storage_node_id, mask); - return array.release(); - } - - // Open an array. - static KeyIDArray *open(Storage *storage, uint32_t storage_node_id) { - std::unique_ptr<KeyIDArray> array(create_instance()); - array->open_array(storage, storage_node_id); - return array.release(); - } - - // Unlink an array. - static void unlink(Storage *storage, uint32_t storage_node_id) { - std::unique_ptr<KeyIDArray> array(open(storage, storage_node_id)); - storage->unlink_node(storage_node_id); - } - - // Return the number of values in each page. - static constexpr uint64_t page_size() { - return KeyIDArrayHelper<T>::PAGE_SIZE; - } - // Return the number of values in Array. - uint64_t size() const { - return impl_.size(); - } - - // Return the storage node ID. - uint32_t storage_node_id() const { - return storage_node_id_; - } - // Return the mask. - uint64_t mask() const { - return mask_; - } - - // Get a value and return its address on success. - Value *get_pointer(uint64_t value_id) { - return &impl_.get_value(value_id & mask_); - } - - private: - Storage *storage_; - uint32_t storage_node_id_; - KeyIDArrayHeader *header_; - ArrayImpl impl_; - uint64_t mask_; - - static KeyIDArray *create_instance() { - KeyIDArray * const array = new (std::nothrow) KeyIDArray; - if (!array) { - GRNXX_ERROR() << "new grnxx::map::hash_table::KeyIDArray failed"; - throw MemoryError(); - } - return array; - } - - void create_array(Storage *storage, uint32_t storage_node_id, - uint64_t mask) { - storage_ = storage; - StorageNode storage_node = - storage_->create_node(storage_node_id, sizeof(KeyIDArrayHeader)); - storage_node_id_ = storage_node.id(); - try { - header_ = static_cast<KeyIDArrayHeader *>(storage_node.body()); - *header_ = KeyIDArrayHeader(); - impl_.create(storage, storage_node_id_, KeyIDArrayHelper<T>::SIZE, - MAP_INVALID_KEY_ID); - mask_ = mask; - header_->impl_storage_node_id = impl_.storage_node_id(); - header_->mask = mask_; - } catch (...) { - storage_->unlink_node(storage_node_id_); - throw; - } - } - - void open_array(Storage *storage, uint32_t storage_node_id) { - storage_ = storage; - StorageNode storage_node = storage_->open_node(storage_node_id); - storage_node_id_ = storage_node.id(); - header_ = static_cast<KeyIDArrayHeader *>(storage_node.body()); - impl_.open(storage, header_->impl_storage_node_id); - mask_ = header_->mask; - } -}; - -} // namespace hash_table -} // namespace map -} // namespace grnxx - -#endif // GRNXX_MAP_HASH_TABLE_KEY_ID_ARRAY_HPP -------------- next part -------------- HTML����������������������������...Télécharger
