Groonga - fulltext search engine.

[Groonga-commit] groonga/grnxx at 0f894e6 [master] Remove grnxx::map::KeyStore.

susumu.yata null+****@clear*****
Wed Jul 24 16:19:39 JST 2013

• Previous message: [Groonga-commit] groonga/grnxx at 9e21605 [master] Update grnxx::map::Patricia to use grnxx::map::KeyPool.
• Next message: [Groonga-commit] groonga/grnxx at 4bc8aa0 [master] Update grnxx::map::DoubleArray to use grnxx::map::KeyPool.
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

susumu.yata	2013-07-24 16:19:39 +0900 (Wed, 24 Jul 2013)

  New Revision: 0f894e6c39699308ba7b2b3dfaf60b65608bf17a
  https://github.com/groonga/grnxx/commit/0f894e6c39699308ba7b2b3dfaf60b65608bf17a

  Message:
    Remove grnxx::map::KeyStore.

  Removed files:
    lib/grnxx/map/key_store.cpp
    lib/grnxx/map/key_store.hpp
  Modified files:
    lib/grnxx/map/Makefile.am

  Modified: lib/grnxx/map/Makefile.am (+0 -2)
===================================================================
--- lib/grnxx/map/Makefile.am    2013-07-24 16:03:53 +0900 (0bd219e)
+++ lib/grnxx/map/Makefile.am    2013-07-24 16:19:39 +0900 (3fe4507)
@@ -19,7 +19,6 @@ libgrnxx_map_la_SOURCES =				\
 	double_array.cpp				\
 	hash_table.cpp					\
 	key_pool.cpp					\
-	key_store.cpp					\
 	patricia.cpp					\
 	scanner_impl.cpp
 
@@ -36,6 +35,5 @@ libgrnxx_map_include_HEADERS =				\
 	header.hpp					\
 	helper.hpp					\
 	key_pool.hpp					\
-	key_store.hpp					\
 	patricia.hpp					\
 	scanner_impl.hpp

  Deleted: lib/grnxx/map/key_store.cpp (+0 -201) 100644
===================================================================
--- lib/grnxx/map/key_store.cpp    2013-07-24 16:03:53 +0900 (6b24e0d)
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
-  Copyright (C) 2012-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
-*/
-#include "grnxx/map/key_store.hpp"
-
-#include "grnxx/exception.hpp"
-#include "grnxx/geo_point.hpp"
-#include "grnxx/intrinsic.hpp"
-#include "grnxx/logger.hpp"
-#include "grnxx/map.hpp"
-#include "grnxx/storage.hpp"
-
-namespace grnxx {
-namespace map {
-namespace {
-
-constexpr uint64_t INVALID_LINK = ~0ULL;
-
-}  // namespace
-
-KeyStoreHeader::KeyStoreHeader()
-    : max_key_id(MAP_MIN_KEY_ID - 1),
-      num_keys(0),
-      latest_link(INVALID_LINK),
-      keys_storage_node_id(STORAGE_INVALID_NODE_ID),
-      bits_storage_node_id(STORAGE_INVALID_NODE_ID),
-      links_storage_node_id(STORAGE_INVALID_NODE_ID) {}
-
-template <typename T>
-KeyStore<T>::KeyStore() {}
-
-template <typename T>
-KeyStore<T>::~KeyStore() {}
-
-template <typename T>
-KeyStore<T> *KeyStore<T>::create(Storage *storage, uint32_t storage_node_id) {
-  if (!storage) {
-    GRNXX_ERROR() << "invalid argument: storage == nullptr";
-    throw LogicError();
-  }
-  std::unique_ptr<KeyStore> store(new (std::nothrow) KeyStore);
-  if (!store) {
-    GRNXX_ERROR() << "new grnxx::map::KeyStore failed";
-    throw MemoryError();
-  }
-  store->create_store(storage, storage_node_id);
-  return store.release();
-}
-
-template <typename T>
-KeyStore<T> *KeyStore<T>::open(Storage *storage, uint32_t storage_node_id) {
-  if (!storage) {
-    GRNXX_ERROR() << "invalid argument: storage == nullptr";
-    throw LogicError();
-  }
-  std::unique_ptr<KeyStore> store(new (std::nothrow) KeyStore);
-  if (!store) {
-    GRNXX_ERROR() << "new grnxx::map::KeyStore failed";
-    throw MemoryError();
-  }
-  store->open_store(storage, storage_node_id);
-  return store.release();
-}
-
-template <typename T>
-bool KeyStore<T>::unset(int64_t key_id) {
-  // Prepare to update "bits_" and "links_".
-  const uint64_t unit_id = key_id / unit_size();
-  const uint64_t unit_bit = 1ULL << (key_id % unit_size());
-  BitArrayUnit * const unit = &bits_->get_unit(unit_id);
-  if ((*unit & unit_bit) == 0) {
-    // Not found.
-    return false;
-  }
-  // Set "link" if this operation creates the first 0 bit in the unit.
-  uint64_t *link = nullptr;
-  if (*unit == ~BitArrayUnit(0)) {
-    link = &links_->get_value(unit_id);
-  }
-  *unit &= ~unit_bit;
-  if (link) {
-    *link = header_->latest_link;
-    header_->latest_link = *link;
-  }
-  --header_->num_keys;
-  return true;
-}
-
-template <typename T>
-int64_t KeyStore<T>::add(KeyArg key) {
-  // Find an unused key ID.
-  const bool is_new_unit = (header_->latest_link == INVALID_LINK);
-  uint64_t unit_id;
-  if (is_new_unit) {
-    unit_id = (header_->max_key_id + 1) / unit_size();
-  } else {
-    unit_id = header_->latest_link;
-  }
-  BitArrayUnit * const unit = &bits_->get_unit(unit_id);
-  uint8_t unit_bit_id;
-  uint64_t unit_bit;
-  uint64_t *link = nullptr;
-  if (is_new_unit) {
-    links_->set(unit_id, INVALID_LINK);
-    *unit = 0;
-    unit_bit_id = 0;
-    unit_bit = 1;
-    header_->latest_link = (header_->max_key_id + 1) / unit_size();
-  } else {
-    unit_bit_id = bit_scan_forward(~*unit);
-    unit_bit = 1ULL << unit_bit_id;
-    if ((*unit | unit_bit) == ~BitArrayUnit(0)) {
-      // The unit will be removed from "links_" if it becomes full.
-      link = &links_->get_value(header_->latest_link);
-    }
-  }
-  const int64_t next_key_id = (unit_id * unit_size()) + unit_bit_id;
-  keys_->set(next_key_id, key);
-  if (link) {
-    header_->latest_link = *link;
-  }
-  *unit |= unit_bit;
-  if (next_key_id > header_->max_key_id) {
-    header_->max_key_id = next_key_id;
-  }
-  ++header_->num_keys;
-  return next_key_id;
-}
-
-template <typename T>
-bool KeyStore<T>::truncate() {
-  header_->max_key_id = MAP_MIN_KEY_ID - 1;
-  header_->num_keys = 0;
-  header_->latest_link = INVALID_LINK;
-  return true;
-}
-
-template <typename T>
-void KeyStore<T>::create_store(Storage *storage, uint32_t storage_node_id) {
-  storage_ = storage;
-  StorageNode storage_node =
-      storage->create_node(storage_node_id, sizeof(Header));
-  storage_node_id_ = storage_node.id();
-  try {
-    header_ = static_cast<Header *>(storage_node.body());
-    *header_ = Header();
-    keys_.reset(KeyArray::create(storage, storage_node_id_,
-                                 KeyStoreHelper<T>::KEY_ARRAY_SIZE));
-    bits_.reset(BitArray::create(storage, storage_node_id_,
-                                 KeyStoreHelper<T>::BIT_ARRAY_SIZE));
-    links_.reset(LinkArray::create(storage, storage_node_id_,
-                                   KeyStoreHelper<T>::LINK_ARRAY_SIZE));
-    header_->keys_storage_node_id = keys_->storage_node_id();
-    header_->bits_storage_node_id = bits_->storage_node_id();
-    header_->links_storage_node_id = links_->storage_node_id();
-  } catch (...) {
-    storage->unlink_node(storage_node_id_);
-    throw;
-  }
-}
-
-template <typename T>
-void KeyStore<T>::open_store(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<Header *>(storage_node.body());
-  // TODO: Check the format.
-  keys_.reset(KeyArray::open(storage, header_->keys_storage_node_id));
-  bits_.reset(BitArray::open(storage, header_->bits_storage_node_id));
-  links_.reset(LinkArray::open(storage, header_->links_storage_node_id));
-}
-
-template class KeyStore<int8_t>;
-template class KeyStore<uint8_t>;
-template class KeyStore<int16_t>;
-template class KeyStore<uint16_t>;
-template class KeyStore<int32_t>;
-template class KeyStore<uint32_t>;
-template class KeyStore<int64_t>;
-template class KeyStore<uint64_t>;
-template class KeyStore<double>;
-template class KeyStore<GeoPoint>;
-template class KeyStore<Bytes>;
-
-}  // namespace map
-}  // namespace grnxx

  Deleted: lib/grnxx/map/key_store.hpp (+0 -176) 100644
===================================================================
--- lib/grnxx/map/key_store.hpp    2013-07-24 16:03:53 +0900 (e52d9e5)
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-  Copyright (C) 2012-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_KEY_STORE_HPP
-#define GRNXX_MAP_KEY_STORE_HPP
-
-#include "grnxx/features.hpp"
-
-#include <memory>
-
-#include "grnxx/array.hpp"
-#include "grnxx/bytes.hpp"
-#include "grnxx/map/bytes_array.hpp"
-#include "grnxx/traits.hpp"
-#include "grnxx/types.hpp"
-
-namespace grnxx {
-
-class Storage;
-
-namespace map {
-
-struct KeyStoreHeader {
-  int64_t max_key_id;
-  uint64_t num_keys;
-  uint64_t latest_link;
-  uint32_t keys_storage_node_id;
-  uint32_t bits_storage_node_id;
-  uint32_t links_storage_node_id;
-
-  KeyStoreHeader();
-};
-
-// Change the size of arrays based on "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 KeyStoreHelper;
-
-// Map<T> has at most 2^40 different keys.
-template <typename T, size_t T_SIZE>
-struct KeyStoreHelper {
-  using KeyArray = Array<T, 65536, 4096>;
-  using BitArray = Array<bool, 65536, 4096>;
-  using LinkArray = Array<uint64_t, 16384, 1024>;
-
-  static constexpr uint64_t KEY_ARRAY_SIZE  = 1ULL << 40;
-  static constexpr uint64_t BIT_ARRAY_SIZE  = 1ULL << 40;
-  static constexpr uint64_t LINK_ARRAY_SIZE = 1ULL << 34;
-};
-
-// Map<T> has at most 2^8 different keys.
-template <typename T>
-struct KeyStoreHelper<T, 1> {
-  using KeyArray = Array<T>;
-  using BitArray = Array<bool>;
-  using LinkArray = Array<uint64_t>;
-
-  static constexpr uint64_t KEY_ARRAY_SIZE  = 1ULL << 8;
-  static constexpr uint64_t BIT_ARRAY_SIZE  = 1ULL << 8;
-  static constexpr uint64_t LINK_ARRAY_SIZE = 1ULL << 2;
-};
-
-// Map<T> has at most 2^16 different keys.
-template <typename T>
-struct KeyStoreHelper<T, 2> {
-  using KeyArray = Array<T, 256>;
-  using BitArray = Array<bool, 256>;
-  using LinkArray = Array<uint64_t>;
-
-  static constexpr uint64_t KEY_ARRAY_SIZE  = 1ULL << 16;
-  static constexpr uint64_t BIT_ARRAY_SIZE  = 1ULL << 16;
-  static constexpr uint64_t LINK_ARRAY_SIZE = 1ULL << 10;
-};
-
-// Map<T> has at most 2^32 different keys.
-template <typename T>
-struct KeyStoreHelper<T, 4> {
-  using KeyArray = Array<T, 65536, 256>;
-  using BitArray = Array<bool, 16384, 512>;
-  using LinkArray = Array<uint64_t, 4096, 128>;
-
-  static constexpr uint64_t KEY_ARRAY_SIZE  = 1ULL << 32;
-  static constexpr uint64_t BIT_ARRAY_SIZE  = 1ULL << 32;
-  static constexpr uint64_t LINK_ARRAY_SIZE = 1ULL << 26;
-};
-
-// Map<T> has at most 2^40 different keys.
-template <>
-struct KeyStoreHelper<Bytes> {
-  using KeyArray = BytesArray;
-  using BitArray = Array<bool, 65536, 4096>;
-  using LinkArray = Array<uint64_t, 16384, 1024>;
-
-  static constexpr uint64_t KEY_ARRAY_SIZE  = 1ULL << 40;
-  static constexpr uint64_t BIT_ARRAY_SIZE  = 1ULL << 40;
-  static constexpr uint64_t LINK_ARRAY_SIZE = 1ULL << 34;
-};
-
-template <typename T>
-class KeyStore {
-  using Header = KeyStoreHeader;
-  using KeyArray = typename KeyStoreHelper<T>::KeyArray;
-  using BitArray = typename KeyStoreHelper<T>::BitArray;
-  using BitArrayUnit = typename BitArray::Unit;
-  using LinkArray = typename KeyStoreHelper<T>::LinkArray;
-
- public:
-  using Key = typename Traits<T>::Type;
-  using KeyArg = typename Traits<T>::ArgumentType;
-
-  KeyStore();
-  ~KeyStore();
-
-  static KeyStore *create(Storage *storage, uint32_t storage_node_id);
-  static KeyStore *open(Storage *storage, uint32_t storage_node_id);
-
-  uint32_t storage_node_id() const {
-    return storage_node_id_;
-  }
-
-  int64_t max_key_id() const {
-    return header_->max_key_id;
-  }
-  uint64_t num_keys() const {
-    return header_->num_keys;
-  }
-
-  Key get_key(int64_t key_id) {
-    return keys_->get(key_id);
-  }
-  bool get_bit(int64_t key_id) {
-    return bits_->get(key_id);
-  }
-  bool unset(int64_t key_id);
-  void reset(int64_t key_id, KeyArg dest_key) {
-    keys_->set(key_id, dest_key);
-  }
-
-  int64_t add(KeyArg key);
-
-  bool truncate();
-
- private:
-  Storage *storage_;
-  uint32_t storage_node_id_;
-  Header *header_;
-  std::unique_ptr<KeyArray> keys_;
-  std::unique_ptr<BitArray> bits_;
-  std::unique_ptr<LinkArray> links_;
-
-  void create_store(Storage *storage, uint32_t storage_node_id);
-  void open_store(Storage *storage, uint32_t storage_node_id);
-
-  static constexpr uint64_t unit_size() {
-    return sizeof(typename BitArray::Unit) * 8;
-  }
-};
-
-}  // namespace map
-}  // namespace grnxx
-
-#endif  // GRNXX_MAP_KEY_STORE_HPP
-------------- next part --------------
HTML����������������������������...
Download 

• Previous message: [Groonga-commit] groonga/grnxx at 9e21605 [master] Update grnxx::map::Patricia to use grnxx::map::KeyPool.
• Next message: [Groonga-commit] groonga/grnxx at 4bc8aa0 [master] Update grnxx::map::DoubleArray to use grnxx::map::KeyPool.
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]