From 5c21d2ae1d56675e62ff6ddad79384ea5b471d1b Mon Sep 17 00:00:00 2001 From: khizmax Date: Sat, 2 Apr 2016 22:02:43 +0300 Subject: [PATCH] Migrated FeldmanHashMap to gtest framework --- projects/Win/vc14/gtest-map.vcxproj | 5 + projects/Win/vc14/gtest-map.vcxproj.filters | 18 + test/unit/map/CMakeLists.txt | 2 + test/unit/map/feldman_hashmap_dhp.cpp | 132 +++++++ test/unit/map/feldman_hashmap_hp.cpp | 142 ++++++++ test/unit/map/test_feldman_hashmap.h | 369 ++++++++++++++++++++ test/unit/map/test_feldman_hashmap_hp.h | 213 +++++++++++ test/unit/map/test_map.h | 206 +---------- test/unit/map/test_map_data.h | 245 +++++++++++++ test/unit/map/test_map_nogc.h | 188 +--------- 10 files changed, 1130 insertions(+), 390 deletions(-) create mode 100644 test/unit/map/feldman_hashmap_dhp.cpp create mode 100644 test/unit/map/feldman_hashmap_hp.cpp create mode 100644 test/unit/map/test_feldman_hashmap.h create mode 100644 test/unit/map/test_feldman_hashmap_hp.h create mode 100644 test/unit/map/test_map_data.h diff --git a/projects/Win/vc14/gtest-map.vcxproj b/projects/Win/vc14/gtest-map.vcxproj index f8d1cefb..f9dc23e9 100644 --- a/projects/Win/vc14/gtest-map.vcxproj +++ b/projects/Win/vc14/gtest-map.vcxproj @@ -28,6 +28,8 @@ + + @@ -189,7 +191,10 @@ + + + diff --git a/projects/Win/vc14/gtest-map.vcxproj.filters b/projects/Win/vc14/gtest-map.vcxproj.filters index ef768c7c..4ecf4ea5 100644 --- a/projects/Win/vc14/gtest-map.vcxproj.filters +++ b/projects/Win/vc14/gtest-map.vcxproj.filters @@ -22,6 +22,9 @@ {1e70af02-0389-402a-bb6e-e1a399628288} + + {d953f61d-84a0-4056-b0b1-9191f256b27b} + @@ -147,6 +150,12 @@ Source Files\SkipListMap + + Source Files\FeldmanHashMap + + + Source Files\FeldmanHashMap + @@ -179,5 +188,14 @@ Header Files + + Header Files + + + Header Files + + + Header Files + \ No newline at end of file diff --git a/test/unit/map/CMakeLists.txt b/test/unit/map/CMakeLists.txt index 96d4ad13..aa9e8b02 100644 --- a/test/unit/map/CMakeLists.txt +++ b/test/unit/map/CMakeLists.txt @@ -2,6 +2,8 @@ set(PACKAGE_NAME unit-map) set(CDSGTEST_MAP_SOURCES ../main.cpp + feldman_hashmap_hp.cpp + feldman_hashmap_dhp.cpp michael_lazy_hp.cpp michael_lazy_dhp.cpp michael_lazy_nogc.cpp diff --git a/test/unit/map/feldman_hashmap_dhp.cpp b/test/unit/map/feldman_hashmap_dhp.cpp new file mode 100644 index 00000000..3a97d78a --- /dev/null +++ b/test/unit/map/feldman_hashmap_dhp.cpp @@ -0,0 +1,132 @@ +/* + This file is a part of libcds - Concurrent Data Structures library + + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016 + + Source code repo: http://github.com/khizmax/libcds/ + Download: http://sourceforge.net/projects/libcds/files/ + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include "test_feldman_hashmap_hp.h" + +#include + +namespace { + namespace cc = cds::container; + typedef cds::gc::DHP gc_type; + + class FeldmanHashMap_DHP : public cds_test::feldman_hashmap_hp + { + protected: + typedef cds_test::feldman_hashmap_hp base_class; + + void SetUp() + { + typedef cc::FeldmanHashMap< gc_type, key_type, value_type > map_type; + + // +1 - for guarded_ptr + cds::gc::dhp::GarbageCollector::Construct( 16, map_type::c_nHazardPtrCount ); + cds::threading::Manager::attachThread(); + } + + void TearDown() + { + cds::threading::Manager::detachThread(); + cds::gc::dhp::GarbageCollector::Destruct(); + } + }; + + TEST_F( FeldmanHashMap_DHP, defaulted ) + { + typedef cc::FeldmanHashMap< gc_type, key_type, value_type > map_type; + + map_type m; + test( m ); + } + + TEST_F( FeldmanHashMap_DHP, compare ) + { + typedef cc::FeldmanHashMap< gc_type, key_type, value_type, + typename cc::feldman_hashmap::make_traits< + cds::opt::compare< cmp > + >::type + > map_type; + + map_type m( 4, 5 ); + test( m ); + } + + TEST_F( FeldmanHashMap_DHP, less ) + { + typedef cc::FeldmanHashMap< gc_type, key_type, value_type, + typename cc::feldman_hashmap::make_traits< + cds::opt::less< less > + >::type + > map_type; + + map_type m( 3, 2 ); + test( m ); + } + + TEST_F( FeldmanHashMap_DHP, cmpmix ) + { + typedef cc::FeldmanHashMap< gc_type, key_type, value_type, + typename cc::feldman_hashmap::make_traits< + cds::opt::less< less > + ,cds::opt::compare< cmp > + >::type + > map_type; + + map_type m( 4, 4 ); + test( m ); + } + + TEST_F( FeldmanHashMap_DHP, backoff ) + { + struct map_traits: public cc::feldman_hashmap::traits + { + typedef cmp compare; + typedef cds::atomicity::item_counter item_counter; + typedef cds::backoff::yield back_off; + }; + typedef cc::FeldmanHashMap< gc_type, key_type, value_type, map_traits > map_type; + + map_type m( 8, 2 ); + test( m ); + } + + TEST_F( FeldmanHashMap_DHP, stat ) + { + struct map_traits: public cc::feldman_hashmap::traits + { + typedef cds::backoff::yield back_off; + typedef cc::feldman_hashmap::stat<> stat; + }; + typedef cc::FeldmanHashMap< gc_type, key_type, value_type, map_traits > map_type; + + map_type m( 1, 1 ); + test( m ); + } + +} // namespace diff --git a/test/unit/map/feldman_hashmap_hp.cpp b/test/unit/map/feldman_hashmap_hp.cpp new file mode 100644 index 00000000..92766e50 --- /dev/null +++ b/test/unit/map/feldman_hashmap_hp.cpp @@ -0,0 +1,142 @@ +/* + This file is a part of libcds - Concurrent Data Structures library + + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016 + + Source code repo: http://github.com/khizmax/libcds/ + Download: http://sourceforge.net/projects/libcds/files/ + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include "test_feldman_hashmap_hp.h" + +#include + +namespace { + namespace cc = cds::container; + typedef cds::gc::HP gc_type; + + class FeldmanHashMap_HP : public cds_test::feldman_hashmap_hp + { + protected: + typedef cds_test::feldman_hashmap_hp base_class; + + void SetUp() + { + typedef cc::FeldmanHashMap< gc_type, key_type, value_type > map_type; + + // +1 - for guarded_ptr + cds::gc::hp::GarbageCollector::Construct( map_type::c_nHazardPtrCount + 1, 1, 16 ); + cds::threading::Manager::attachThread(); + } + + void TearDown() + { + cds::threading::Manager::detachThread(); + cds::gc::hp::GarbageCollector::Destruct( true ); + } + }; + + TEST_F( FeldmanHashMap_HP, defaulted ) + { + typedef cc::FeldmanHashMap< gc_type, key_type, value_type > map_type; + + map_type m; + test( m ); + } + + TEST_F( FeldmanHashMap_HP, compare ) + { + typedef cc::FeldmanHashMap< gc_type, key_type, value_type, + typename cc::feldman_hashmap::make_traits< + cds::opt::compare< cmp > + >::type + > map_type; + + map_type m( 4, 5 ); + EXPECT_GE( m.head_size(), 1 << 4 ); + EXPECT_EQ( m.array_node_size(), 1 << 5 ); + test( m ); + } + + TEST_F( FeldmanHashMap_HP, less ) + { + typedef cc::FeldmanHashMap< gc_type, key_type, value_type, + typename cc::feldman_hashmap::make_traits< + cds::opt::less< less > + >::type + > map_type; + + map_type m( 3, 2 ); + EXPECT_GE( m.head_size(), 1 << 4 ); // min = 2 ** 4 + EXPECT_EQ( m.array_node_size(), 1 << 2 ); + test( m ); + } + + TEST_F( FeldmanHashMap_HP, cmpmix ) + { + typedef cc::FeldmanHashMap< gc_type, key_type, value_type, + typename cc::feldman_hashmap::make_traits< + cds::opt::less< less > + ,cds::opt::compare< cmp > + >::type + > map_type; + + map_type m( 4, 4 ); + EXPECT_EQ( m.head_size(), 1 << 4 ); + EXPECT_EQ( m.array_node_size(), 1 << 4 ); + test( m ); + } + + TEST_F( FeldmanHashMap_HP, backoff ) + { + struct map_traits: public cc::feldman_hashmap::traits + { + typedef cmp compare; + typedef cds::atomicity::item_counter item_counter; + typedef cds::backoff::yield back_off; + }; + typedef cc::FeldmanHashMap< gc_type, key_type, value_type, map_traits > map_type; + + map_type m( 8, 2 ); + EXPECT_EQ( m.head_size(), 1 << 8 ); + EXPECT_EQ( m.array_node_size(), 1 << 2 ); + test( m ); + } + + TEST_F( FeldmanHashMap_HP, stat ) + { + struct map_traits: public cc::feldman_hashmap::traits + { + typedef cds::backoff::yield back_off; + typedef cc::feldman_hashmap::stat<> stat; + }; + typedef cc::FeldmanHashMap< gc_type, key_type, value_type, map_traits > map_type; + + map_type m( 1, 1 ); + EXPECT_EQ( m.head_size(), 1 << 4 ); // min = 2**4 + EXPECT_EQ( m.array_node_size(), 1 << 2 ); // min = 2**2 + test( m ); + } + +} // namespace diff --git a/test/unit/map/test_feldman_hashmap.h b/test/unit/map/test_feldman_hashmap.h new file mode 100644 index 00000000..47703c6e --- /dev/null +++ b/test/unit/map/test_feldman_hashmap.h @@ -0,0 +1,369 @@ +/* + This file is a part of libcds - Concurrent Data Structures library + + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016 + + Source code repo: http://github.com/khizmax/libcds/ + Download: http://sourceforge.net/projects/libcds/files/ + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef CDSUNIT_MAP_TEST_FELDMAN_HASHMAP_H +#define CDSUNIT_MAP_TEST_FELDMAN_HASHMAP_H + +#include "test_map_data.h" + +// forward declaration +namespace cds { namespace container {}} +namespace co = cds::opt; +namespace cc = cds::container; + +namespace cds_test { + + class feldman_hashmap : public map_fixture + { + public: + static size_t const kSize = 1000; + + protected: + template + void test( Map& m ) + { + // Precondition: map is empty + // Postcondition: map is empty + + ASSERT_TRUE( m.empty() ); + ASSERT_CONTAINER_SIZE( m, 0 ); + + typedef typename Map::value_type map_pair; + size_t const kkSize = kSize; + + std::vector arrKeys; + for ( int i = 0; i < static_cast(kkSize); ++i ) + arrKeys.push_back( key_type( i ) ); + shuffle( arrKeys.begin(), arrKeys.end() ); + + std::vector< value_type > arrVals; + for ( size_t i = 0; i < kkSize; ++i ) { + value_type val; + val.nVal = static_cast(i); + val.strVal = std::to_string( i ); + arrVals.push_back( val ); + } + + // insert/find + for ( auto const& i : arrKeys ) { + value_type const& val( arrVals.at( i.nKey ) ); + + ASSERT_FALSE( m.contains( i.nKey ) ); + ASSERT_FALSE( m.contains( i ) ); + ASSERT_FALSE( m.find( i, []( map_pair const& ) { + ASSERT_TRUE( false ); + } ) ); + ASSERT_FALSE( m.find( i.nKey, []( map_pair const& ) { + EXPECT_TRUE( false ); + } ) ); + + std::pair< bool, bool > updResult; + + switch ( i.nKey % 16 ) { + case 0: + ASSERT_TRUE( m.insert( i ) ); + ASSERT_FALSE( m.insert( i ) ); + ASSERT_TRUE( m.find( i.nKey, []( map_pair& v ) { + v.second.nVal = v.first.nKey; + v.second.strVal = std::to_string( v.first.nKey ); + } ) ); + break; + case 1: + ASSERT_TRUE( m.insert( i.nKey ) ); + ASSERT_FALSE( m.insert( i.nKey ) ); + ASSERT_TRUE( m.find( i.nKey, []( map_pair& v ) { + v.second.nVal = v.first.nKey; + v.second.strVal = std::to_string( v.first.nKey ); + } ) ); + break; + case 2: + ASSERT_TRUE( m.insert( std::to_string( i.nKey ) ) ); + ASSERT_FALSE( m.insert( std::to_string( i.nKey ) ) ); + ASSERT_TRUE( m.find( i.nKey, []( map_pair& v ) { + v.second.nVal = v.first.nKey; + v.second.strVal = std::to_string( v.first.nKey ); + } ) ); + break; + case 3: + ASSERT_TRUE( m.insert( i, val ) ); + ASSERT_FALSE( m.insert( i, val ) ); + break; + case 4: + ASSERT_TRUE( m.insert( i.nKey, val.strVal ) ); + ASSERT_FALSE( m.insert( i.nKey, val.strVal ) ); + break; + case 5: + ASSERT_TRUE( m.insert( val.strVal, i.nKey ) ); + ASSERT_FALSE( m.insert( val.strVal, i.nKey ) ); + break; + case 6: + ASSERT_TRUE( m.insert_with( i, []( map_pair& v ) { + v.second.nVal = v.first.nKey; + v.second.strVal = std::to_string( v.first.nKey ); + } ) ); + ASSERT_FALSE( m.insert_with( i, []( map_pair& v ) { + EXPECT_TRUE( false ); + } ) ); + break; + case 7: + ASSERT_TRUE( m.insert_with( i.nKey, []( map_pair& v ) { + v.second.nVal = v.first.nKey; + v.second.strVal = std::to_string( v.first.nKey ); + } ) ); + ASSERT_FALSE( m.insert_with( i.nKey, []( map_pair& v ) { + EXPECT_TRUE( false ); + } ) ); + break; + case 8: + ASSERT_TRUE( m.insert_with( val.strVal, []( map_pair& v ) { + v.second.nVal = v.first.nKey; + v.second.strVal = std::to_string( v.first.nKey ); + } ) ); + ASSERT_FALSE( m.insert_with( val.strVal, []( map_pair& v ) { + EXPECT_TRUE( false ); + } ) ); + break; + case 9: + updResult = m.update( i.nKey, []( map_pair&, map_pair* ) { + EXPECT_TRUE( false ); + }, false ); + ASSERT_FALSE( updResult.first ); + ASSERT_FALSE( updResult.second ); + + updResult = m.update( i.nKey, []( map_pair& v, map_pair* old ) { + EXPECT_TRUE( old == nullptr ); + v.second.nVal = v.first.nKey; + } ); + ASSERT_TRUE( updResult.first ); + ASSERT_TRUE( updResult.second ); + + updResult = m.update( i.nKey, []( map_pair& v, map_pair* old ) { + ASSERT_FALSE( old == nullptr ); + EXPECT_EQ( v.first.nKey, old->second.nVal ); + v.second.nVal = old->second.nVal; + v.second.strVal = std::to_string( v.second.nVal ); + } ); + ASSERT_TRUE( updResult.first ); + ASSERT_FALSE( updResult.second ); + break; + case 10: + updResult = m.update( i, []( map_pair&, map_pair* ) { + EXPECT_TRUE( false ); + }, false ); + ASSERT_FALSE( updResult.first ); + ASSERT_FALSE( updResult.second ); + + updResult = m.update( i, []( map_pair& v, map_pair* old ) { + EXPECT_TRUE( old == nullptr ); + v.second.nVal = v.first.nKey; + } ); + ASSERT_TRUE( updResult.first ); + ASSERT_TRUE( updResult.second ); + + updResult = m.update( i, []( map_pair& v, map_pair* old ) { + ASSERT_FALSE( old == nullptr ); + EXPECT_EQ( v.first.nKey, old->second.nVal ); + v.second.nVal = old->second.nVal; + v.second.strVal = std::to_string( v.second.nVal ); + } ); + ASSERT_TRUE( updResult.first ); + ASSERT_FALSE( updResult.second ); + break; + case 11: + updResult = m.update( val.strVal, []( map_pair&, map_pair* ) { + EXPECT_TRUE( false ); + }, false ); + ASSERT_FALSE( updResult.first ); + ASSERT_FALSE( updResult.second ); + + updResult = m.update( val.strVal, []( map_pair& v, map_pair* old ) { + EXPECT_TRUE( old == nullptr ); + v.second.nVal = v.first.nKey; + } ); + ASSERT_TRUE( updResult.first ); + ASSERT_TRUE( updResult.second ); + + updResult = m.update( val.strVal, []( map_pair& v, map_pair* old ) { + ASSERT_FALSE( old == nullptr ); + EXPECT_EQ( v.first.nKey, old->second.nVal ); + v.second.nVal = old->second.nVal; + v.second.strVal = std::to_string( v.second.nVal ); + } ); + ASSERT_TRUE( updResult.first ); + ASSERT_FALSE( updResult.second ); + break; + case 12: + ASSERT_TRUE( m.emplace( i.nKey ) ); + ASSERT_FALSE( m.emplace( i.nKey ) ); + ASSERT_TRUE( m.find( i.nKey, []( map_pair& v ) { + v.second.nVal = v.first.nKey; + v.second.strVal = std::to_string( v.first.nKey ); + } ) ); + break; + case 13: + ASSERT_TRUE( m.emplace( i, i.nKey ) ); + ASSERT_FALSE( m.emplace( i, i.nKey ) ); + break; + case 14: + { + std::string str = val.strVal; + ASSERT_TRUE( m.emplace( i, std::move( str ) ) ); + ASSERT_TRUE( str.empty() ); + str = val.strVal; + ASSERT_FALSE( m.emplace( i, std::move( str ) ) ); + ASSERT_TRUE( str.empty() ); + } + break; + case 15: + { + std::string str = val.strVal; + ASSERT_TRUE( m.emplace( i, i.nKey, std::move( str ) ) ); + ASSERT_TRUE( str.empty() ); + str = val.strVal; + ASSERT_FALSE( m.emplace( i, i.nKey, std::move( str ) ) ); + ASSERT_TRUE( str.empty() ); + } + break; + } + + ASSERT_TRUE( m.contains( i.nKey ) ); + ASSERT_TRUE( m.contains( i ) ); + ASSERT_TRUE( m.find( i, []( map_pair const& v ) { + EXPECT_EQ( v.first.nKey, v.second.nVal ); + EXPECT_EQ( std::to_string( v.first.nKey ), v.second.strVal ); + } ) ); + ASSERT_TRUE( m.find( i.nKey, []( map_pair const& v ) { + EXPECT_EQ( v.first.nKey, v.second.nVal ); + EXPECT_EQ( std::to_string( v.first.nKey ), v.second.strVal ); + } ) ); + } + ASSERT_FALSE( m.empty() ); + ASSERT_CONTAINER_SIZE( m, kkSize ); + ASSERT_FALSE( m.begin() == m.end() ); + ASSERT_FALSE( m.cbegin() == m.cend() ); + + shuffle( arrKeys.begin(), arrKeys.end() ); + + { + std::vector< typename Map::level_statistics > vect; + m.get_level_statistics( vect ); + } + + // erase/find + for ( auto const& i : arrKeys ) { + value_type const& val( arrVals.at( i.nKey ) ); + + ASSERT_TRUE( m.contains( i.nKey ) ); + ASSERT_TRUE( m.contains( val.strVal ) ); + ASSERT_TRUE( m.contains( i ) ); + ASSERT_TRUE( m.find( i, []( map_pair const& v ) { + EXPECT_EQ( v.first.nKey, v.second.nVal ); + EXPECT_EQ( std::to_string( v.first.nKey ), v.second.strVal ); + } ) ); + ASSERT_TRUE( m.find( i.nKey, []( map_pair const& v ) { + EXPECT_EQ( v.first.nKey, v.second.nVal ); + EXPECT_EQ( std::to_string( v.first.nKey ), v.second.strVal ); + } ) ); + + switch ( i.nKey % 6 ) { + case 0: + ASSERT_TRUE( m.erase( i ) ); + ASSERT_FALSE( m.erase( i ) ); + break; + case 1: + ASSERT_TRUE( m.erase( i.nKey ) ); + ASSERT_FALSE( m.erase( i.nKey ) ); + break; + case 2: + ASSERT_TRUE( m.erase( val.strVal ) ); + ASSERT_FALSE( m.erase( val.strVal ) ); + break; + case 3: + ASSERT_TRUE( m.erase( i, []( map_pair& v ) { + EXPECT_EQ( v.first.nKey, v.second.nVal ); + EXPECT_EQ( std::to_string( v.first.nKey ), v.second.strVal ); + } ) ); + ASSERT_FALSE( m.erase( i, []( map_pair& ) { + EXPECT_TRUE( false ); + } ) ); + break; + case 4: + ASSERT_TRUE( m.erase( i.nKey, []( map_pair& v ) { + EXPECT_EQ( v.first.nKey, v.second.nVal ); + EXPECT_EQ( std::to_string( v.first.nKey ), v.second.strVal ); + } ) ); + ASSERT_FALSE( m.erase( i.nKey, []( map_pair& ) { + EXPECT_TRUE( false ); + } ) ); + break; + case 5: + ASSERT_TRUE( m.erase( val.strVal, []( map_pair& v ) { + EXPECT_EQ( v.first.nKey, v.second.nVal ); + EXPECT_EQ( std::to_string( v.first.nKey ), v.second.strVal ); + } ) ); + ASSERT_FALSE( m.erase( val.strVal, []( map_pair& ) { + EXPECT_TRUE( false ); + } ) ); + break; + } + + ASSERT_FALSE( m.contains( i.nKey ) ); + ASSERT_FALSE( m.contains( i ) ); + ASSERT_FALSE( m.contains( val.strVal ) ); + ASSERT_FALSE( m.find( i, []( map_pair const& ) { + ASSERT_TRUE( false ); + } ) ); + ASSERT_FALSE( m.find( i.nKey, []( map_pair const& ) { + EXPECT_TRUE( false ); + } ) ); + } + ASSERT_TRUE( m.empty() ); + ASSERT_CONTAINER_SIZE( m, 0 ); + + ASSERT_TRUE( m.begin() == m.end() ); + ASSERT_TRUE( m.cbegin() == m.cend() ); + + // clear + for ( auto const& i : arrKeys ) + ASSERT_TRUE( m.insert( i ) ); + + ASSERT_FALSE( m.empty() ); + ASSERT_CONTAINER_SIZE( m, kkSize ); + + m.clear(); + + ASSERT_TRUE( m.empty() ); + ASSERT_CONTAINER_SIZE( m, 0 ); + } + }; + +} // namespace cds_test + +#endif // CDSUNIT_MAP_TEST_FELDMAN_HASHMAP_H diff --git a/test/unit/map/test_feldman_hashmap_hp.h b/test/unit/map/test_feldman_hashmap_hp.h new file mode 100644 index 00000000..004f30ae --- /dev/null +++ b/test/unit/map/test_feldman_hashmap_hp.h @@ -0,0 +1,213 @@ +/* + This file is a part of libcds - Concurrent Data Structures library + + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016 + + Source code repo: http://github.com/khizmax/libcds/ + Download: http://sourceforge.net/projects/libcds/files/ + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef CDSUNIT_MAP_TEST_FELDMAN_HASHMAP_HP_H +#define CDSUNIT_MAP_TEST_FELDMAN_HASHMAP_HP_H + +#include "test_feldman_hashmap.h" + +namespace cds_test { + + class feldman_hashmap_hp: public feldman_hashmap + { + typedef feldman_hashmap base_class; + + protected: + template + void test( Map& m ) + { + // Precondition: map is empty + // Postcondition: map is empty + + base_class::test( m ); + + ASSERT_TRUE( m.empty()); + ASSERT_CONTAINER_SIZE( m, 0 ); + + typedef typename Map::value_type map_pair; + size_t const kkSize = base_class::kSize; + + std::vector arrKeys; + for ( int i = 0; i < static_cast(kkSize); ++i ) + arrKeys.push_back( key_type( i )); + shuffle( arrKeys.begin(), arrKeys.end()); + + std::vector< value_type > arrVals; + for ( size_t i = 0; i < kkSize; ++i ) { + value_type val; + val.nVal = static_cast( i ); + val.strVal = std::to_string( i ); + arrVals.push_back( val ); + } + + for ( auto const& i : arrKeys ) + ASSERT_TRUE( m.insert( i ) ); + ASSERT_FALSE( m.empty() ); + ASSERT_CONTAINER_SIZE( m, kkSize ); + + // iterators + size_t nCount = 0; + for ( auto it = m.begin(); it != m.end(); ++it ) { + EXPECT_EQ( it->second.nVal, 0 ); + it->second.nVal = it->first.nKey * 2; + ++nCount; + } + EXPECT_EQ( nCount, kkSize ); + + nCount = 0; + for ( auto it = m.cbegin(); it != m.cend(); ++it ) { + EXPECT_EQ( it->second.nVal, it->first.nKey * 2 ); + ++nCount; + } + EXPECT_EQ( nCount, kkSize ); + + nCount = 0; + for ( auto it = m.rbegin(); it != m.rend(); ++it ) { + EXPECT_EQ( it->second.nVal, it->first.nKey * 2 ); + it->second.nVal = it->first.nKey * 4; + ++nCount; + } + EXPECT_EQ( nCount, kkSize ); + + nCount = 0; + for ( auto it = m.crbegin(); it != m.crend(); ++it ) { + EXPECT_EQ( it->second.nVal, it->first.nKey * 4 ); + ++nCount; + } + EXPECT_EQ( nCount, kkSize ); + + // get/extract + typedef typename Map::guarded_ptr guarded_ptr; + guarded_ptr gp; + + for ( auto const& i : arrKeys ) { + value_type const& val = arrVals.at( i.nKey ); + + gp = m.get( i.nKey ); + ASSERT_FALSE( !gp ); + ASSERT_EQ( gp->first.nKey, i.nKey ); + gp.release(); + gp = m.get( i ); + ASSERT_FALSE( !gp ); + ASSERT_EQ( gp->first.nKey, i.nKey ); + gp.release(); + + switch ( i.nKey % 3 ) { + case 0: + gp = m.extract( i.nKey ); + break; + case 1: + gp = m.extract( i ); + break; + case 2: + gp = m.extract( val.strVal ); + break; + } + ASSERT_FALSE( !gp ); + ASSERT_EQ( gp->first.nKey, i.nKey ); + gp.release(); + + gp = m.get( i.nKey ); + ASSERT_TRUE( !gp ); + gp = m.get( i ); + ASSERT_TRUE( !gp ); + } + ASSERT_TRUE( m.empty() ); + ASSERT_CONTAINER_SIZE( m, 0 ); + + // erase_at( iterator ) + for ( auto const& i : arrKeys ) + ASSERT_TRUE( m.insert( i ) ); + ASSERT_FALSE( m.empty() ); + ASSERT_CONTAINER_SIZE( m, kkSize ); + + nCount = 0; + for ( auto it = m.begin(); it != m.end(); ++it ) { + EXPECT_EQ( it->second.nVal, 0 ); + ASSERT_TRUE( m.erase_at( it )); + ++nCount; + } + EXPECT_EQ( nCount, kkSize ); + ASSERT_TRUE( m.empty() ); + ASSERT_CONTAINER_SIZE( m, 0 ); + + // erase_at( reverse_iterator ) + for ( auto const& i : arrKeys ) + ASSERT_TRUE( m.insert( i ) ); + ASSERT_FALSE( m.empty() ); + ASSERT_CONTAINER_SIZE( m, kkSize ); + + nCount = 0; + for ( auto it = m.rbegin(); it != m.rend(); ++it ) { + EXPECT_EQ( it->second.nVal, 0 ); + ASSERT_TRUE( m.erase_at( it ) ); + ++nCount; + } + EXPECT_EQ( nCount, kkSize ); + ASSERT_TRUE( m.empty() ); + ASSERT_CONTAINER_SIZE( m, 0 ); + + // erase_at( const_reverse_iterator ) + for ( auto const& i : arrKeys ) + ASSERT_TRUE( m.insert( i ) ); + ASSERT_FALSE( m.empty() ); + ASSERT_CONTAINER_SIZE( m, kkSize ); + + nCount = 0; + for ( auto it = m.crbegin(); it != m.crend(); ++it ) { + EXPECT_EQ( it->second.nVal, 0 ); + ASSERT_TRUE( m.erase_at( it ) ); + ++nCount; + } + EXPECT_EQ( nCount, kkSize ); + ASSERT_TRUE( m.empty() ); + ASSERT_CONTAINER_SIZE( m, 0 ); + + // erase_at( const_iterator ) + for ( auto const& i : arrKeys ) + ASSERT_TRUE( m.insert( i ) ); + ASSERT_FALSE( m.empty() ); + ASSERT_CONTAINER_SIZE( m, kkSize ); + + nCount = 0; + for ( auto it = m.cbegin(); it != m.cend(); ++it ) { + EXPECT_EQ( it->second.nVal, 0 ); + ASSERT_TRUE( m.erase_at( it ) ); + ++nCount; + } + EXPECT_EQ( nCount, kkSize ); + ASSERT_TRUE( m.empty() ); + ASSERT_CONTAINER_SIZE( m, 0 ); + } + }; + +} // namespace cds_test + +#endif // #ifndef CDSUNIT_MAP_TEST_FELDMAN_HASHMAP_HP_H diff --git a/test/unit/map/test_map.h b/test/unit/map/test_map.h index 4ae9fe62..2c3912c2 100644 --- a/test/unit/map/test_map.h +++ b/test/unit/map/test_map.h @@ -31,220 +31,18 @@ #ifndef CDSUNIT_MAP_TEST_MAP_H #define CDSUNIT_MAP_TEST_MAP_H -#include -#include - -#include +#include "test_map_data.h" // forward declaration namespace cds { namespace container {} } namespace cds_test { - class container_map: public fixture + class container_map: public map_fixture { public: static size_t const kSize = 1000; - struct key_type { - int nKey; - - explicit key_type( int n ) - : nKey( n ) - {} - - explicit key_type( std::string const& str ) - : nKey( std::stoi( str )) - {} - - key_type( key_type const& s ) - : nKey( s.nKey ) - {} - }; - - struct value_type { - int nVal; - std::string strVal; - - value_type() - : nVal( 0 ) - {} - - explicit value_type( int n ) - : nVal( n ) - , strVal( std::to_string( n )) - {} - - explicit value_type( std::string const& str ) - : nVal( std::stoi( str )) - , strVal( str ) - {} - - explicit value_type( std::string&& str ) - : nVal( std::stoi( str )) - , strVal( std::move( str )) - {} - - value_type( int n, std::string const& str ) - : nVal( n ) - , strVal( str ) - {} - - value_type( int n, std::string&& str ) - : nVal( n ) - , strVal( std::move( str )) - {} - - value_type( value_type&& v ) - : nVal( v.nVal ) - , strVal( std::move( v.strVal )) - {} - - value_type( value_type const& v ) - : nVal( v.nVal ) - , strVal( v.strVal ) - {} - - value_type& operator=( value_type const& v ) - { - if ( this != &v ) { - nVal = v.nVal; - strVal = v.strVal; - } - return *this; - } - - value_type& operator=( value_type&& v ) - { - if ( this != &v ) { - nVal = v.nVal; - strVal = std::move( v.strVal ); - } - return *this; - } - - value_type& operator=( int i ) - { - nVal = i; - strVal = std::to_string( i ); - return *this; - } - - value_type& operator=( std::string const& s ) - { - nVal = std::stoi( s ); - strVal = s; - return *this; - } - }; - - typedef std::pair pair_type; - - struct less - { - bool operator ()( key_type const& v1, key_type const& v2 ) const - { - return v1.nKey < v2.nKey; - } - - bool operator ()( key_type const& v1, int v2 ) const - { - return v1.nKey < v2; - } - - bool operator ()( int v1, key_type const& v2 ) const - { - return v1 < v2.nKey; - } - - bool operator ()( key_type const& v1, std::string const& v2 ) const - { - return v1.nKey < std::stoi(v2 ); - } - - bool operator ()( std::string const& v1, key_type const& v2 ) const - { - return std::stoi( v1 ) < v2.nKey; - } - }; - - struct cmp { - int operator ()( key_type const& v1, key_type const& v2 ) const - { - if ( v1.nKey < v2.nKey ) - return -1; - return v1.nKey > v2.nKey ? 1 : 0; - } - - int operator ()( key_type const& v1, int v2 ) const - { - if ( v1.nKey < v2 ) - return -1; - return v1.nKey > v2 ? 1 : 0; - } - - int operator ()( int v1, key_type const& v2 ) const - { - if ( v1 < v2.nKey ) - return -1; - return v1 > v2.nKey ? 1 : 0; - } - - int operator ()( key_type const& v1, std::string const& v2 ) const - { - int n2 = std::stoi( v2 ); - if ( v1.nKey < n2 ) - return -1; - return v1.nKey > n2 ? 1 : 0; - } - - int operator ()( std::string const& v1, key_type const& v2 ) const - { - int n1 = std::stoi( v1 ); - if ( n1 < v2.nKey ) - return -1; - return n1 > v2.nKey ? 1 : 0; - } - }; - - struct hash1 { - size_t operator()( int i ) const - { - return cds::opt::v::hash()( i ); - } - - size_t operator()( std::string const& str ) const - { - return cds::opt::v::hash()( std::stoi( str )); - } - - template - size_t operator()( T const& i ) const - { - return cds::opt::v::hash()(i.nKey); - } - }; - - struct other_item { - int nKey; - - other_item( int key ) - : nKey( key ) - {} - }; - - struct other_less - { - bool operator ()( key_type const& v1, other_item const& v2 ) const - { - return v1.nKey < v2.nKey; - } - bool operator ()( other_item const& v1, key_type const& v2 ) const - { - return v1.nKey < v2.nKey; - } - }; - protected: template void test( Map& m ) diff --git a/test/unit/map/test_map_data.h b/test/unit/map/test_map_data.h new file mode 100644 index 00000000..abb0055f --- /dev/null +++ b/test/unit/map/test_map_data.h @@ -0,0 +1,245 @@ +/* + This file is a part of libcds - Concurrent Data Structures library + + (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016 + + Source code repo: http://github.com/khizmax/libcds/ + Download: http://sourceforge.net/projects/libcds/files/ + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef CDSUNIT_MAP_TEST_MAP_DATA_H +#define CDSUNIT_MAP_TEST_MAP_DATA_H + +#include +#include + +#include + +namespace cds_test { + + class map_fixture: public fixture + { + public: + struct key_type { + int nKey; + + explicit key_type( int n ) + : nKey( n ) + {} + + explicit key_type( std::string const& str ) + : nKey( std::stoi( str )) + {} + + key_type( key_type const& s ) + : nKey( s.nKey ) + {} + }; + + struct value_type { + int nVal; + std::string strVal; + + value_type() + : nVal( 0 ) + {} + + explicit value_type( int n ) + : nVal( n ) + , strVal( std::to_string( n )) + {} + + explicit value_type( std::string const& str ) + : nVal( std::stoi( str )) + , strVal( str ) + {} + + explicit value_type( std::string&& str ) + : nVal( std::stoi( str )) + , strVal( std::move( str )) + {} + + value_type( int n, std::string const& str ) + : nVal( n ) + , strVal( str ) + {} + + value_type( int n, std::string&& str ) + : nVal( n ) + , strVal( std::move( str )) + {} + + value_type( value_type&& v ) + : nVal( v.nVal ) + , strVal( std::move( v.strVal )) + {} + + value_type( value_type const& v ) + : nVal( v.nVal ) + , strVal( v.strVal ) + {} + + value_type& operator=( value_type const& v ) + { + if ( this != &v ) { + nVal = v.nVal; + strVal = v.strVal; + } + return *this; + } + + value_type& operator=( value_type&& v ) + { + if ( this != &v ) { + nVal = v.nVal; + strVal = std::move( v.strVal ); + } + return *this; + } + + value_type& operator=( int i ) + { + nVal = i; + strVal = std::to_string( i ); + return *this; + } + + value_type& operator=( std::string const& s ) + { + nVal = std::stoi( s ); + strVal = s; + return *this; + } + }; + + typedef std::pair pair_type; + + struct less + { + bool operator ()( key_type const& v1, key_type const& v2 ) const + { + return v1.nKey < v2.nKey; + } + + bool operator ()( key_type const& v1, int v2 ) const + { + return v1.nKey < v2; + } + + bool operator ()( int v1, key_type const& v2 ) const + { + return v1 < v2.nKey; + } + + bool operator ()( key_type const& v1, std::string const& v2 ) const + { + return v1.nKey < std::stoi(v2 ); + } + + bool operator ()( std::string const& v1, key_type const& v2 ) const + { + return std::stoi( v1 ) < v2.nKey; + } + }; + + struct cmp { + int operator ()( key_type const& v1, key_type const& v2 ) const + { + if ( v1.nKey < v2.nKey ) + return -1; + return v1.nKey > v2.nKey ? 1 : 0; + } + + int operator ()( key_type const& v1, int v2 ) const + { + if ( v1.nKey < v2 ) + return -1; + return v1.nKey > v2 ? 1 : 0; + } + + int operator ()( int v1, key_type const& v2 ) const + { + if ( v1 < v2.nKey ) + return -1; + return v1 > v2.nKey ? 1 : 0; + } + + int operator ()( key_type const& v1, std::string const& v2 ) const + { + int n2 = std::stoi( v2 ); + if ( v1.nKey < n2 ) + return -1; + return v1.nKey > n2 ? 1 : 0; + } + + int operator ()( std::string const& v1, key_type const& v2 ) const + { + int n1 = std::stoi( v1 ); + if ( n1 < v2.nKey ) + return -1; + return n1 > v2.nKey ? 1 : 0; + } + }; + + struct hash1 { + size_t operator()( int i ) const + { + return cds::opt::v::hash()( i ); + } + + size_t operator()( std::string const& str ) const + { + return cds::opt::v::hash()( std::stoi( str )); + } + + template + size_t operator()( T const& i ) const + { + return cds::opt::v::hash()(i.nKey); + } + }; + + struct other_item { + int nKey; + + other_item( int key ) + : nKey( key ) + {} + }; + + struct other_less + { + bool operator ()( key_type const& v1, other_item const& v2 ) const + { + return v1.nKey < v2.nKey; + } + bool operator ()( other_item const& v1, key_type const& v2 ) const + { + return v1.nKey < v2.nKey; + } + }; + }; +} // namespace cds_test + +#endif // diff --git a/test/unit/map/test_map_nogc.h b/test/unit/map/test_map_nogc.h index 47813705..cc8abb93 100644 --- a/test/unit/map/test_map_nogc.h +++ b/test/unit/map/test_map_nogc.h @@ -31,202 +31,18 @@ #ifndef CDSUNIT_MAP_TEST_MAP_NOGC_H #define CDSUNIT_MAP_TEST_MAP_NOGC_H -#include -#include - -#include +#include "test_map_data.h" // forward declaration namespace cds { namespace container {} } namespace cds_test { - class container_map_nogc: public fixture + class container_map_nogc: public map_fixture { public: static size_t const kSize = 1000; - struct key_type { - int nKey; - - explicit key_type( int n ) - : nKey( n ) - {} - - explicit key_type( std::string const& str ) - : nKey( std::stoi( str )) - {} - }; - - struct value_type { - int nVal; - std::string strVal; - - value_type() - : nVal( 0 ) - {} - - explicit value_type( int n ) - : nVal( n ) - , strVal( std::to_string( n )) - {} - - explicit value_type( std::string const& str ) - : nVal( std::stoi( str )) - , strVal( str ) - {} - - explicit value_type( std::string&& str ) - : nVal( std::stoi( str )) - , strVal( std::move( str )) - {} - - value_type( int n, std::string const& str ) - : nVal( n ) - , strVal( str ) - {} - - value_type( int n, std::string&& str ) - : nVal( n ) - , strVal( std::move( str )) - {} - - value_type( value_type&& v ) - : nVal( v.nVal ) - , strVal( std::move( v.strVal )) - {} - - value_type( value_type const& v ) - : nVal( v.nVal ) - , strVal( v.strVal ) - {} - - value_type& operator=( value_type const& v ) - { - if ( this != &v ) { - nVal = v.nVal; - strVal = v.strVal; - } - return *this; - } - - value_type& operator=( value_type&& v ) - { - if ( this != &v ) { - nVal = v.nVal; - strVal = std::move( v.strVal ); - } - return *this; - } - }; - - typedef std::pair pair_type; - - struct less - { - bool operator ()( key_type const& v1, key_type const& v2 ) const - { - return v1.nKey < v2.nKey; - } - - bool operator ()( key_type const& v1, int v2 ) const - { - return v1.nKey < v2; - } - - bool operator ()( int v1, key_type const& v2 ) const - { - return v1 < v2.nKey; - } - - bool operator ()( key_type const& v1, std::string const& v2 ) const - { - return v1.nKey < std::stoi(v2 ); - } - - bool operator ()( std::string const& v1, key_type const& v2 ) const - { - return std::stoi( v1 ) < v2.nKey; - } - }; - - struct cmp { - int operator ()( key_type const& v1, key_type const& v2 ) const - { - if ( v1.nKey < v2.nKey ) - return -1; - return v1.nKey > v2.nKey ? 1 : 0; - } - - int operator ()( key_type const& v1, int v2 ) const - { - if ( v1.nKey < v2 ) - return -1; - return v1.nKey > v2 ? 1 : 0; - } - - int operator ()( int v1, key_type const& v2 ) const - { - if ( v1 < v2.nKey ) - return -1; - return v1 > v2.nKey ? 1 : 0; - } - - int operator ()( key_type const& v1, std::string const& v2 ) const - { - int n2 = std::stoi( v2 ); - if ( v1.nKey < n2 ) - return -1; - return v1.nKey > n2 ? 1 : 0; - } - - int operator ()( std::string const& v1, key_type const& v2 ) const - { - int n1 = std::stoi( v1 ); - if ( n1 < v2.nKey ) - return -1; - return n1 > v2.nKey ? 1 : 0; - } - }; - - struct hash1 { - size_t operator()( int i ) const - { - return cds::opt::v::hash()( i ); - } - - size_t operator()( std::string const& str ) const - { - return cds::opt::v::hash()( std::stoi( str )); - } - - template - size_t operator()( T const& i ) const - { - return cds::opt::v::hash()(i.nKey); - } - }; - - struct other_item { - int nKey; - - other_item( int key ) - : nKey( key ) - {} - }; - - struct other_less - { - bool operator ()( key_type const& v1, other_item const& v2 ) const - { - return v1.nKey < v2.nKey; - } - bool operator ()( other_item const& v1, key_type const& v2 ) const - { - return v1.nKey < v2.nKey; - } - }; - protected: template void test( Map& m ) -- 2.34.1