Merge pull request #918 from igchor/radix_tree_assing_val_fix

Radix tree assing val fix

Author: lukaszstolarczuk

include/libpmemobj++/detail/template_helpers.hpp

@@ -47,6 +47,16 @@ using is_transparent = typename Compare::is_transparent;
 template <typename Compare>
 using has_is_transparent = detail::supports<Compare, is_transparent>;
 
+/* Check if type is pmem::obj::basic_inline_string */
+template <typename>
+struct is_inline_string : std::false_type {
+};
+
+template <typename CharT, typename Traits>
+struct is_inline_string<obj::experimental::basic_inline_string<CharT, Traits>>
+    : std::true_type {
+};
+
 /* Check if type is pmem::obj::basic_string or
  * pmem::obj::basic_inline_string */
 template <typename>

include/libpmemobj++/experimental/radix_tree.hpp

@@ -598,12 +598,14 @@ struct radix_tree<Key, Value, BytesView>::radix_tree_iterator {
 
 	template <typename V = Value,
 		  typename Enable = typename std::enable_if<
-			  std::is_same<V, inline_string>::value>::type>
-	void assign_val(string_view rhs);
+			  detail::is_inline_string<V>::value>::type>
+	void assign_val(basic_string_view<typename V::value_type,
+					  typename V::traits_type>
+				rhs);
 
 	template <typename T, typename V = Value,
 		  typename Enable = typename std::enable_if<
-			  !std::is_same<V, inline_string>::value>::type>
+			  !detail::is_inline_string<V>::value>::type>
 	void assign_val(T &&rhs);
 
 	radix_tree_iterator &operator++();
@@ -2777,7 +2779,7 @@ template <bool IsConst>
 template <typename V, typename Enable>
 void
 radix_tree<Key, Value, BytesView>::radix_tree_iterator<IsConst>::assign_val(
-	string_view rhs)
+	basic_string_view<typename V::value_type, typename V::traits_type> rhs)
 {
 	auto pop = pool_base(pmemobj_pool_by_ptr(leaf_));
 

tests/radix/radix.hpp

@@ -25,7 +25,8 @@ using container_int_string =
 	nvobjex::radix_tree<unsigned, nvobjex::inline_string>;
 
 using container_inline_s_wchart = nvobjex::radix_tree<nvobjex::basic_inline_string<wchar_t>, nvobj::p<unsigned>>;
-using container_inline_s_u8t = nvobjex::radix_tree<nvobjex::basic_inline_string<uint8_t>, nvobj::p<unsigned>>;
+using container_inline_s_wchart_wchart = nvobjex::radix_tree<nvobjex::basic_inline_string<wchar_t>, nvobjex::basic_inline_string<wchar_t>>;
+using container_inline_s_u8t = nvobjex::radix_tree<nvobjex::basic_inline_string<uint8_t>, nvobjex::basic_inline_string<uint8_t>>;
 
 struct root {
 	nvobj::persistent_ptr<container_int> radix_int;
@@ -35,6 +36,7 @@ struct root {
 	nvobj::persistent_ptr<container_int_string> radix_int_str;
 
 	nvobj::persistent_ptr<container_inline_s_wchart> radix_inline_s_wchart;
+	nvobj::persistent_ptr<container_inline_s_wchart_wchart> radix_inline_s_wchart_wchart;
 	nvobj::persistent_ptr<container_inline_s_u8t> radix_inline_s_u8t;
 };
 
@@ -60,7 +62,7 @@ value(unsigned v, int repeats = 1)
 	auto s = std::basic_string<CharT>{};
 	for (int i = 0; i < repeats; i++) {
 		auto str = std::to_string(v);
-		s += std::basic_string<CharT>(s.begin(), s.end());
+		s += std::basic_string<CharT>(str.begin(), str.end());
 	}
 
 	return s;
@@ -100,7 +102,7 @@ template <typename CharT, typename Traits>
 bool
 operator==(pmem::obj::experimental::basic_inline_string<CharT, Traits> &lhs, const std::basic_string<CharT, Traits> &rhs)
 {
-	return pmem::obj::basic_string_view<CharT, Traits>(lhs.data()).compare(rhs) == 0;
+	return pmem::obj::basic_string_view<CharT, Traits>(lhs.data(), lhs.size()).compare(rhs) == 0;
 }
 
 template <typename Container, typename K, typename F>

tests/radix/radix_basic.cpp

@@ -809,31 +809,35 @@ test_inline_string_u8t_key(nvobj::pool<root> &pop)
 
 	for (unsigned i = 0; i < 10; i++) {
 		auto key = std::basic_string<uint8_t>(i + 10, 99);
-		auto ret = m.try_emplace(key, i);
+		auto ret = m.try_emplace(
+			key, std::basic_string<uint8_t>({uint8_t(i)}));
 		UT_ASSERT(ret.second);
 		UT_ASSERT(key.compare(ret.first->key().data()) == 0);
-		UT_ASSERT(ret.first->value() == i);
+		UT_ASSERT(ret.first->value() ==
+			  std::basic_string<uint8_t>({uint8_t(i)}));
 		UT_ASSERT(m.size() == i + 1);
 	}
 
 	for (unsigned i = 0; i < 10; i++) {
 		auto key = std::basic_string<uint8_t>(i + 10, 99);
-		auto ret = m.insert_or_assign(key, i + 1);
+		auto ret = m.insert_or_assign(
+			key, std::basic_string<uint8_t>({uint8_t(i + 1)}));
 		UT_ASSERT(!ret.second);
 		UT_ASSERT(key.compare(ret.first->key().data()) == 0);
-		UT_ASSERT(ret.first->value() == i + 1);
+		UT_ASSERT(ret.first->value() ==
+			  std::basic_string<uint8_t>({uint8_t(i + 1)}));
 		UT_ASSERT(m.size() == 10);
 	}
 
 	auto key = std::basic_string<uint8_t>(15, 99);
 	auto it = m.find(key);
 	UT_ASSERT(key.compare(it->key().data()) == 0);
-	UT_ASSERT(it->value() == 6);
+	UT_ASSERT(it->value() == std::basic_string<uint8_t>({uint8_t(6)}));
 
 	it = m.erase(it);
 	UT_ASSERT(std::basic_string<uint8_t>(16, 99).compare(
 			  it->key().data()) == 0);
-	UT_ASSERT(it->value() == 7);
+	UT_ASSERT(it->value() == std::basic_string<uint8_t>({uint8_t(7)}));
 
 	nvobj::transaction::run(pop, [&] {
 		nvobj::delete_persistent<container_inline_s_u8t>(

tests/radix/radix_tx_abort.cpp

@@ -247,8 +247,8 @@ test_assign(nvobj::pool<root> &pop, nvobj::persistent_ptr<Container> &ptr)
 
 	/* Iterators and references for inline_string are not
 	 * stable. */
-	if (std::is_same<typename Container::mapped_type,
-			 nvobjex::inline_string>::value) {
+	if (pmem::detail::is_inline_string<
+		    typename Container::mapped_type>::value) {
 		it = ptr->find(key<Container>(test_key));
 	}
 
@@ -303,8 +303,8 @@ test_assign_internal_leaf(nvobj::pool<root> &pop,
 
 	/* Iterators and references for inline_string are not
 	 * stable. */
-	if (std::is_same<typename Container::mapped_type,
-			 nvobjex::inline_string>::value) {
+	if (pmem::detail::is_inline_string<
+		    typename Container::mapped_type>::value) {
 		it = ptr->find("");
 	}
 
@@ -322,8 +322,8 @@ test_assign_internal_leaf(nvobj::pool<root> &pop,
 
 	/* Iterators and references for inline_string are not
 	 * stable. */
-	if (std::is_same<typename Container::mapped_type,
-			 nvobjex::inline_string>::value) {
+	if (pmem::detail::is_inline_string<
+		    typename Container::mapped_type>::value) {
 		it = ptr->find("aaa");
 	}
 
@@ -366,8 +366,8 @@ test_assign_root(nvobj::pool<root> &pop, nvobj::persistent_ptr<Container> &ptr)
 
 	/* Iterators and references for inline_string are not
 	 * stable. */
-	if (std::is_same<typename Container::mapped_type,
-			 nvobjex::inline_string>::value) {
+	if (pmem::detail::is_inline_string<
+		    typename Container::mapped_type>::value) {
 		it = ptr->find(key<Container>(0));
 	}
 
@@ -562,6 +562,22 @@ test(int argc, char *argv[])
 	test_try_emplace<container_inline_s_wchart, 1>(
 		pop, pop.root()->radix_inline_s_wchart);
 
+	test_emplace(pop, pop.root()->radix_inline_s_wchart_wchart);
+	test_assign<container_inline_s_wchart_wchart, 1>(
+		pop, pop.root()->radix_inline_s_wchart_wchart);
+	test_assign<container_inline_s_wchart_wchart, 1024>(
+		pop, pop.root()->radix_inline_s_wchart_wchart);
+	test_assign_root<container_inline_s_wchart_wchart, 1>(
+		pop, pop.root()->radix_inline_s_wchart_wchart);
+	test_assign_root<container_inline_s_wchart_wchart, 1024>(
+		pop, pop.root()->radix_inline_s_wchart_wchart);
+	test_erase<container_inline_s_wchart_wchart, 1024>(
+		pop, pop.root()->radix_inline_s_wchart_wchart);
+	test_insert_or_assign<container_inline_s_wchart_wchart, 1>(
+		pop, pop.root()->radix_inline_s_wchart_wchart);
+	test_try_emplace<container_inline_s_wchart_wchart, 1>(
+		pop, pop.root()->radix_inline_s_wchart_wchart);
+
 	pop.close();
 }