Merge pull request #731 from lukaszstolarczuk/merge-stable1.8-to-stable1.9

Merge stable-1.8 into stable-1.9

Author: igchor

CMakeLists.txt

@@ -167,7 +167,7 @@ if(BUILD_TESTS OR BUILD_EXAMPLES)
 		find_package(LIBPMEM REQUIRED ${LIBPMEM_REQUIRED_VERSION})
 	endif()
 
-	if (LIBPMEMOBJ_VERSION)
+	if (LIBPMEMOBJ_VERSION AND LIBPMEMOBJ_VERSION MATCHES "[0-9]+[.][0-9]+.*")
 		string(REGEX REPLACE "\\+git.*" "" LIBPMEMOBJ_VERSION_SHORT ${LIBPMEMOBJ_VERSION})
 		string(REGEX REPLACE "-rc.*" "" LIBPMEMOBJ_VERSION_SHORT ${LIBPMEMOBJ_VERSION_SHORT})
 		string(REPLACE "." ";" VERSION_LIST ${LIBPMEMOBJ_VERSION_SHORT})

include/libpmemobj++/container/detail/contiguous_iterator.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019, Intel Corporation
+ * Copyright 2018-2020, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -175,7 +175,7 @@ struct contiguous_iterator {
 	/**
 	 * Element access operator.
 	 */
-	Reference operator[](std::size_t n)
+	Reference operator[](std::ptrdiff_t n)
 	{
 		return ptr[n];
 	}
@@ -259,7 +259,7 @@ struct range_snapshotting_iterator
 	 *
 	 * Adds element to a transaction.
 	 */
-	reference operator[](std::size_t n)
+	reference operator[](std::ptrdiff_t n)
 	{
 		detail::conditional_add_to_tx(&this->ptr[n], 1,
 					      POBJ_XADD_ASSUME_INITIALIZED);
@@ -409,7 +409,7 @@ struct basic_contiguous_iterator
 	 *
 	 * Adds range containing specified element to a transaction.
 	 */
-	reference operator[](std::size_t n)
+	reference operator[](std::ptrdiff_t n)
 	{
 		detail::conditional_add_to_tx(&this->ptr[n], 1,
 					      POBJ_XADD_ASSUME_INITIALIZED);

include/libpmemobj++/slice.hpp

@@ -134,7 +134,8 @@ class slice {
 		if (idx >= size())
 			throw std::out_of_range("pmem::obj::slice");
 
-		return it_begin[idx];
+		return it_begin[static_cast<typename std::iterator_traits<
+			Iterator>::difference_type>(idx)];
 	}
 
 	/**
@@ -143,7 +144,8 @@ class slice {
 	 */
 	reference operator[](size_type idx)
 	{
-		return it_begin[idx];
+		return it_begin[static_cast<typename std::iterator_traits<
+			Iterator>::difference_type>(idx)];
 	}
 
 	size_type

tests/array_iterator/array_iterator.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019, Intel Corporation
+ * Copyright 2018-2020, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -64,7 +64,7 @@ struct Test1 {
 
 		swap(it, it2);
 
-		it2[c.size() - 1] = 10;
+		it2[static_cast<std::ptrdiff_t>(c.size() - 1)] = 10;
 		it[20] = 20;
 
 		UT_ASSERT(c[c.size() - 1] == 10);

tests/concurrent_hash_map_pmreorder_insert_erase_mt/concurrent_hash_map_pmreorder_insert_erase_mt.cpp

@@ -44,6 +44,7 @@
 #
 
 set -e
+source $(dirname $0)/valid-branches.sh
 
 # Environment variables that can be customized (default values are after dash):
 export KEEP_CONTAINER=${KEEP_CONTAINER:-0}
@@ -112,8 +113,8 @@ fi
 
 if [ -n "$DNS_SERVER" ]; then DNS_SETTING=" --dns=$DNS_SERVER "; fi
 
-# Only run doc update on pmem/libpmemobj-cpp master branch
-if [[ "$TRAVIS_BRANCH" != "master" || "$TRAVIS_PULL_REQUEST" != "false" || "$TRAVIS_REPO_SLUG" != "${GITHUB_REPO}" ]]; then
+# Only run doc update on $GITHUB_REPO master or stable branch
+if [[ -z "${TRAVIS_BRANCH}" || -z "${TARGET_BRANCHES[${TRAVIS_BRANCH}]}" || "$TRAVIS_PULL_REQUEST" != "false" || "$TRAVIS_REPO_SLUG" != "${GITHUB_REPO}" ]]; then
 	AUTO_DOC_UPDATE=0
 fi
 

utils/docker/build.sh

@@ -38,6 +38,10 @@
 FROM fedora:rawhide
 MAINTAINER szymom.romik@intel.com
 
+# Additional parameters to build docker without building components
+ARG SKIP_VALGRIND_BUILD
+ARG SKIP_PMDK_BUILD
+
 # Install basic tools
 RUN dnf update -y \
  && dnf install -y \

utils/docker/images/Dockerfile.fedora-rawhide

@@ -38,6 +38,10 @@
 FROM ubuntu:19.10
 MAINTAINER szymon.romik@intel.com
 
+# Additional parameters to build docker without building components
+ARG SKIP_VALGRIND_BUILD
+ARG SKIP_PMDK_BUILD
+
 ENV DEBIAN_FRONTEND noninteractive
 
 # Update the Apt cache and install basic tools

utils/docker/images/Dockerfile.ubuntu-19.10

@@ -41,6 +41,11 @@ PACKAGE_MANAGER=$1
 # tag: 1.8, 31.01.2020
 PMDK_VERSION="1.8"
 
+if [ "${SKIP_PMDK_BUILD}" ]; then
+	echo "Variable 'SKIP_PMDK_BUILD' is set; skipping building PMDK"
+	exit
+fi
+
 git clone https://github.com/pmem/pmdk
 cd pmdk
 git checkout $PMDK_VERSION

utils/docker/images/install-pmdk.sh

@@ -36,6 +36,11 @@
 
 set -e
 
+if [ "${SKIP_VALGRIND_BUILD}" ]; then
+	echo "Variable 'SKIP_VALGRIND_BUILD' is set; skipping building valgrind (pmem's fork)"
+	exit
+fi
+
 git clone --recursive https://github.com/pmem/valgrind.git
 cd valgrind
 # pmem-3.15: Merge pull request #73 from kkajrewicz/fix-memcheck