susumu.yata
null+****@clear*****
Tue Jul 23 13:44:59 JST 2013
susumu.yata 2013-07-23 13:44:59 +0900 (Tue, 23 Jul 2013) New Revision: a528c064899d4fcaa102c48fb9208fada19ca4d7 https://github.com/groonga/grnxx/commit/a528c064899d4fcaa102c48fb9208fada19ca4d7 Message: Remove unused files. Removed files: lib/grnxx/map/double_array/header.cpp lib/grnxx/map/double_array/header.hpp lib/grnxx/map/hash_table/header.cpp lib/grnxx/map/hash_table/header.hpp lib/grnxx/map/patricia/header.cpp lib/grnxx/map/patricia/header.hpp Modified files: lib/grnxx/map/double_array/Makefile.am lib/grnxx/map/double_array/dummy.cpp lib/grnxx/map/hash_table/Makefile.am lib/grnxx/map/patricia/Makefile.am lib/grnxx/map/patricia/dummy.cpp Modified: lib/grnxx/map/double_array/Makefile.am (+1 -3) =================================================================== --- lib/grnxx/map/double_array/Makefile.am 2013-07-23 13:42:16 +0900 (9539683) +++ lib/grnxx/map/double_array/Makefile.am 2013-07-23 13:44:59 +0900 (fa45df8) @@ -3,13 +3,11 @@ noinst_LTLIBRARIES = libgrnxx_map_double_array.la libgrnxx_map_double_array_la_LDFLAGS = @AM_LTLDFLAGS@ libgrnxx_map_double_array_la_SOURCES = \ - dummy.cpp \ - header.cpp + dummy.cpp libgrnxx_map_double_array_includedir = ${includedir}/grnxx/map/double_array libgrnxx_map_double_array_include_HEADERS = \ block.hpp \ dummy.hpp \ entry.hpp \ - header.hpp \ node.hpp Modified: lib/grnxx/map/double_array/dummy.cpp (+0 -1) =================================================================== --- lib/grnxx/map/double_array/dummy.cpp 2013-07-23 13:42:16 +0900 (efc0711) +++ lib/grnxx/map/double_array/dummy.cpp 2013-07-23 13:44:59 +0900 (a5568d2) @@ -19,7 +19,6 @@ #include "grnxx/map/double_array/block.hpp" #include "grnxx/map/double_array/entry.hpp" -#include "grnxx/map/double_array/header.hpp" #include "grnxx/map/double_array/node.hpp" namespace grnxx { Deleted: lib/grnxx/map/double_array/header.cpp (+0 -47) 100644 =================================================================== --- lib/grnxx/map/double_array/header.cpp 2013-07-23 13:42:16 +0900 (90cc149) +++ /dev/null @@ -1,47 +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/double_array/header.hpp" - -#include "grnxx/storage.hpp" - -namespace grnxx { -namespace map { -namespace double_array { - -Header::Header() - : map_type(MAP_DOUBLE_ARRAY), - max_key_id(MAP_MIN_KEY_ID - 1), - num_keys(0), - nodes_storage_node_id(STORAGE_INVALID_NODE_ID), - siblings_storage_node_id(STORAGE_INVALID_NODE_ID), - blocks_storage_node_id(STORAGE_INVALID_NODE_ID), - entries_storage_node_id(STORAGE_INVALID_NODE_ID), - pool_storage_node_id(STORAGE_INVALID_NODE_ID), - next_key_id(MAP_MIN_KEY_ID), - num_blocks(0), - num_phantoms(0), - num_zombies(0), - latest_blocks() { - for (uint64_t i = 0; i <= BLOCK_MAX_LEVEL; ++i) { - latest_blocks[i] = BLOCK_INVALID_ID; - } -} - -} // namespace double_array -} // namespace map -} // namespace grnxx Deleted: lib/grnxx/map/double_array/header.hpp (+0 -53) 100644 =================================================================== --- lib/grnxx/map/double_array/header.hpp 2013-07-23 13:42:16 +0900 (1958207) +++ /dev/null @@ -1,53 +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_DOUBLE_ARRAY_HEADER_HPP -#define GRNXX_MAP_DOUBLE_ARRAY_HEADER_HPP - -#include "grnxx/features.hpp" - -#include "grnxx/map/double_array/block.hpp" -#include "grnxx/map.hpp" -#include "grnxx/types.hpp" - -namespace grnxx { -namespace map { -namespace double_array { - -struct Header { - MapType map_type; - int64_t max_key_id; - uint64_t num_keys; - uint32_t nodes_storage_node_id; - uint32_t siblings_storage_node_id; - uint32_t blocks_storage_node_id; - uint32_t entries_storage_node_id; - uint32_t pool_storage_node_id; - uint64_t next_key_id; - uint64_t num_blocks; - uint64_t num_phantoms; - uint64_t num_zombies; - uint64_t latest_blocks[BLOCK_MAX_LEVEL + 1]; - - Header(); -}; - -} // namespace double_array -} // namespace map -} // namespace grnxx - -#endif // GRNXX_MAP_DOUBLE_ARRAY_HEADER_HPP Modified: lib/grnxx/map/hash_table/Makefile.am (+2 -4) =================================================================== --- lib/grnxx/map/hash_table/Makefile.am 2013-07-23 13:42:16 +0900 (775a8a4) +++ lib/grnxx/map/hash_table/Makefile.am 2013-07-23 13:44:59 +0900 (bcb1a90) @@ -3,11 +3,9 @@ noinst_LTLIBRARIES = libgrnxx_map_hash_table.la libgrnxx_map_hash_table_la_LDFLAGS = @AM_LTLDFLAGS@ libgrnxx_map_hash_table_la_SOURCES = \ - dummy.cpp \ - header.cpp + dummy.cpp libgrnxx_map_hash_table_includedir = ${includedir}/grnxx/map/hash_table libgrnxx_map_hash_table_include_HEADERS = \ dummy.hpp \ - hash.hpp \ - header.hpp + hash.hpp Deleted: lib/grnxx/map/hash_table/header.cpp (+0 -36) 100644 =================================================================== --- lib/grnxx/map/hash_table/header.cpp 2013-07-23 13:42:16 +0900 (9a78f29) +++ /dev/null @@ -1,36 +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/hash_table/header.hpp" - -#include "grnxx/storage.hpp" - -namespace grnxx { -namespace map { -namespace hash_table { - -Header::Header() - : map_type(MAP_HASH_TABLE), - key_ids_storage_node_id(STORAGE_INVALID_NODE_ID), - old_key_ids_storage_node_id(STORAGE_INVALID_NODE_ID), - keys_storage_node_id(STORAGE_INVALID_NODE_ID), - num_key_ids(0), - mutex() {} - -} // namespace hash_table -} // namespace map -} // namespace grnxx Deleted: lib/grnxx/map/hash_table/header.hpp (+0 -46) 100644 =================================================================== --- lib/grnxx/map/hash_table/header.hpp 2013-07-23 13:42:16 +0900 (7118165) +++ /dev/null @@ -1,46 +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_HASH_TABLE_HEADER_HPP -#define GRNXX_MAP_HASH_TABLE_HEADER_HPP - -#include "grnxx/features.hpp" - -#include "grnxx/map.hpp" -#include "grnxx/mutex.hpp" -#include "grnxx/types.hpp" - -namespace grnxx { -namespace map { -namespace hash_table { - -struct Header { - MapType map_type; - uint32_t key_ids_storage_node_id; - uint32_t old_key_ids_storage_node_id; - uint32_t keys_storage_node_id; - uint64_t num_key_ids; - Mutex mutex; - - Header(); -}; - -} // namespace hash_table -} // namespace map -} // namespace grnxx - -#endif // GRNXX_MAP_HASH_TABLE_HEADER_HPP Modified: lib/grnxx/map/patricia/Makefile.am (+1 -3) =================================================================== --- lib/grnxx/map/patricia/Makefile.am 2013-07-23 13:42:16 +0900 (17e7ebf) +++ lib/grnxx/map/patricia/Makefile.am 2013-07-23 13:44:59 +0900 (5b2868a) @@ -3,11 +3,9 @@ noinst_LTLIBRARIES = libgrnxx_map_patricia.la libgrnxx_map_patricia_la_LDFLAGS = @AM_LTLDFLAGS@ libgrnxx_map_patricia_la_SOURCES = \ - dummy.cpp \ - header.cpp + dummy.cpp libgrnxx_map_patricia_includedir = ${includedir}/grnxx/map/patricia libgrnxx_map_patricia_include_HEADERS = \ dummy.hpp \ - header.hpp \ node.hpp Modified: lib/grnxx/map/patricia/dummy.cpp (+0 -1) =================================================================== --- lib/grnxx/map/patricia/dummy.cpp 2013-07-23 13:42:16 +0900 (28aeb81) +++ lib/grnxx/map/patricia/dummy.cpp 2013-07-23 13:44:59 +0900 (0fa7a5d) @@ -17,7 +17,6 @@ */ #include "grnxx/map/patricia/dummy.hpp" -#include "grnxx/map/patricia/header.hpp" #include "grnxx/map/patricia/node.hpp" namespace grnxx { Deleted: lib/grnxx/map/patricia/header.cpp (+0 -35) 100644 =================================================================== --- lib/grnxx/map/patricia/header.cpp 2013-07-23 13:42:16 +0900 (4f6872f) +++ /dev/null @@ -1,35 +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/patricia/header.hpp" - -#include "grnxx/storage.hpp" - -namespace grnxx { -namespace map { -namespace patricia { - -Header::Header() - : map_type(MAP_PATRICIA), - next_node_id(2), - nodes_storage_node_id(STORAGE_INVALID_NODE_ID), - keys_storage_node_id(STORAGE_INVALID_NODE_ID), - cache_storage_node_id(STORAGE_INVALID_NODE_ID) {} - -} // namespace patricia -} // namespace map -} // namespace grnxx Deleted: lib/grnxx/map/patricia/header.hpp (+0 -44) 100644 =================================================================== --- lib/grnxx/map/patricia/header.hpp 2013-07-23 13:42:16 +0900 (f355c16) +++ /dev/null @@ -1,44 +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_PATRICIA_HEADER_HPP -#define GRNXX_MAP_PATRICIA_HEADER_HPP - -#include "grnxx/features.hpp" - -#include "grnxx/map.hpp" -#include "grnxx/types.hpp" - -namespace grnxx { -namespace map { -namespace patricia { - -struct Header { - MapType map_type; - uint64_t next_node_id; - uint32_t nodes_storage_node_id; - uint32_t keys_storage_node_id; - uint32_t cache_storage_node_id; - - Header(); -}; - -} // namespace patricia -} // namespace map -} // namespace grnxx - -#endif // GRNXX_MAP_PATRICIA_HEADER_HPP -------------- next part -------------- HTML����������������������������...Download