Merge pull request #284 from riptano/1.10.0_alpha_prep

mikefero · web-flow · commit 2f6110840410 · 2019-09-04T10:53:56.000-04:00
1.10.0 alpha prep
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,32 @@
+1.10.0-alpha
+===========
+
+Features
+--------
+* [CPP-787] DataStax cloud platform
+  * [CPP-788] Support SNI at connection level using `host_id` as host name
+    * [CPP-793] Add SNI support to `SocketConnector` and SSL backend
+    * [CPP-794] Add domain name resolution to `SocketConnector`
+    * [CPP-795] Replace `Address` with endpoint or host type on connection path
+    * [CPP-797] Events need to map from affected node address to `host_id`
+    * [CPP-800] Node discovery should use the `host_id` (and endpoint address) instead of the
+      node's rpc_address
+  * [CPP-790] Configuration API for DBaaS
+    * [CPP-791] Add creds.zip support for automatic configuration
+    * [CPP-798] Configure authentication and SSL from secure connection bundle configuration
+    * [CPP-799] Use metadata service to determine contact points
+    * [CPP-788] Support SNI at connection level using `host_id` as host name
+    * [CPP-803] Propagate `local_dc` from `CloudClusterMetadataResolver` to load balancing policies
+
+Bug Fixes
+--------
+* [CPP-786] Fix TLS 1.3 support
+* [CPP-806] Fix handling of no contact points
+
+Other
+--------
+* [CPP-796] Correct compiler flags for mixed C and C++ projects
+
 1.9.0
 ===========
 
@@ -172,7 +201,7 @@ Bug Fixes
 
 Other
 --------
-[CPP-449] Update vc_build.bat to include automated build for Visual Studio 2017
+* [CPP-449] Update vc_build.bat to include automated build for Visual Studio 2017
 
 1.3.0
 ===========
@@ -250,7 +279,6 @@ Other
 
 1.0.0
 ===========
-October 20, 2016
 
 Features
 --------
@@ -261,7 +289,6 @@ Features
 
 1.0.0-rc1
 ===========
-June 24, 2016
 
 Features
 --------
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -210,6 +210,12 @@ if(DSE_BUILD_STATIC)
   endif()
   CassConfigureStatic("DSE")
 
+  # Set pkg_config required libraries
+  set(PC_REQUIRED_LIBS "libuv")
+  if (DSE_USE_OPENSSL)
+    set(PC_REQUIRED_LIBS "${PC_REQUIRED_LIBS} openssl")
+  endif()
+
   set_property(TARGET ${PROJECT_LIB_NAME_STATIC} PROPERTY FOLDER "Driver/DSE")
 endif()
 
diff --git a/README.md b/README.md
@@ -23,6 +23,7 @@ multiple architectures, can be obtained from our [download server].
 * DSE [proxy authentication][DSE Proxy Authentication] and
   [execution][DSE Proxy Execution]
 * [DSE DateRange]
+* Support for [DataStax Constellation] Cloud Data Platform
 
 ## Compatibility
 
@@ -43,7 +44,6 @@ __Disclaimer__: DataStax products do not support big-endian systems.
 
 * JIRA: https://datastax-oss.atlassian.net/browse/CPP (Assign "Component/s" field set to "DSE")
 * Mailing List: https://groups.google.com/a/lists.datastax.com/forum/#!forum/cpp-driver-user
-* DataStax Academy via Slack: https://academy.datastax.com/slack
 
 ## Feedback Requested
 
@@ -110,6 +110,7 @@ The full license terms are available at
 http://www.datastax.com/terms/datastax-dse-driver-license-terms
 
 [DSE]: http://www.datastax.com/products/datastax-enterprise
+[DataStax Constellation]: https://constellation.datastax.com
 [DataStax C/C++ driver for Apache Cassandra]: https://github.com/datastax/cpp-driver
 [download server]: http://downloads.datastax.com/cpp-driver
 [GitHub]: https://github.com/datastax/cpp-dse-driver
diff --git a/appveyor.yml b/appveyor.yml
@@ -40,7 +40,7 @@ environment:
   DRIVER_TYPE: DSE
   BOOST_VERSION: 1.69.0
   LIBSSH2_VERSION: 1.9.0
-  LIBUV_VERSION: 1.29.1
+  LIBUV_VERSION: 1.31.0
   OPENSSL_1_0_VERSION: 1.0.2s
   OPENSSL_1_1_VERSION: 1.1.1c
   ZLIB_VERSION: 1.2.11
diff --git a/build.yaml b/build.yaml
@@ -19,7 +19,7 @@ os:
   - centos/7-64/cpp
   - osx/high-sierra
 env:
-  LIBUV_VERSION: 1.29.1
+  LIBUV_VERSION: 1.31.0
 build:
   - script: |
       . ./cpp-driver/.build.sh
diff --git a/cpp-driver/CHANGELOG.md b/cpp-driver/CHANGELOG.md
@@ -1,3 +1,38 @@
+2.14.0-alpha
+===========
+
+Features
+--------
+* [CPP-787] DataStax cloud platform
+  * [CPP-788] Support SNI at connection level using `host_id` as host name
+    * [CPP-793] Add SNI support to `SocketConnector` and SSL backend
+    * [CPP-794] Add domain name resolution to `SocketConnector`
+    * [CPP-795] Replace `Address` with endpoint or host type on connection path
+    * [CPP-797] Events need to map from affected node address to `host_id`
+    * [CPP-800] Node discovery should use the `host_id` (and endpoint address) instead of the
+      node's rpc_address
+  * [CPP-790] Configuration API for DBaaS
+    * [CPP-791] Add creds.zip support for automatic configuration
+    * [CPP-798] Configure authentication and SSL from secure connection bundle configuration
+    * [CPP-799] Use metadata service to determine contact points
+    * [CPP-788] Support SNI at connection level using `host_id` as host name
+    * [CPP-803] Propagate `local_dc` from `CloudClusterMetadataResolver` to load balancing policies
+
+Bug Fixes
+--------
+* [CPP-786] Fix TLS 1.3 support
+* [CPP-806] Fix handling of no contact points
+
+Other
+--------
+* [CPP-796] Correct compiler flags for mixed C and C++ projects
+
+Community
+--------
+* [CPP-754] Broken build with GCC 9 (eevans)
+* Add openssl to the required library list in pkg_config file (accelerated)
+* Allow random to work with 0 (joeyhub)
+
 2.13.0
 ===========
 
diff --git a/cpp-driver/CMakeLists.txt b/cpp-driver/CMakeLists.txt
@@ -145,6 +145,18 @@ if(CASS_BUILD_STATIC)
   endif()
   CassConfigureStatic("CASS")
 
+  # Set pkg_config required libraries
+  set(PC_REQUIRED_LIBS "libuv")
+  if (CASS_USE_OPENSSL)
+    set(PC_REQUIRED_LIBS "${PC_REQUIRED_LIBS} openssl")
+  endif()
+
+  # Update the test flags to indicate the use of the static library
+  if(CASS_USE_STATIC_LIBS)
+    set(TEST_CXX_FLAGS "${TEST_CXX_FLAGS} -DCASS_STATIC")
+    set(CASS_TEST_CXX_FLAGS "${CASS_TEST_CXX_FLAGS} -DCASS_STATIC")
+  endif()
+
   set_property(TARGET ${PROJECT_LIB_NAME_STATIC} PROPERTY FOLDER "Driver/Cassandra")
 endif()
 
diff --git a/cpp-driver/README.md b/cpp-driver/README.md
@@ -51,6 +51,7 @@ provided with the distribution:
 * [Reverse DNS] with SSL peer identity verification support
 * Randomized contact points
 * [Speculative execution]
+* Support for [DataStax Constellation] Cloud Data Platform
 
 ## Compatibility
 
@@ -78,7 +79,6 @@ __Disclaimer__: DataStax products do not support big-endian systems.
 
 * JIRA: https://datastax-oss.atlassian.net/browse/CPP
 * Mailing List: https://groups.google.com/a/lists.datastax.com/forum/#!forum/cpp-driver-user
-* DataStax Academy via Slack: https://academy.datastax.com/slack
 
 ## Feedback Requested
 
@@ -184,7 +184,7 @@ specific language governing permissions and limitations under the License.
 [DSE C/C++ driver]: http://docs.datastax.com/en/developer/cpp-driver-dse/latest
 [DataStax Enterprise]: http://www.datastax.com/products/datastax-enterprise
 [Examples]: examples/
-[download server]: http://downloads.datastax.com/cpp-driver
+[download server]: http://downloads.datastax.com/cpp-driver/
 [GitHub]: https://github.com/datastax/cpp-driver
 [cpp-driver-compatability-matrix]: https://docs.datastax.com/en/developer/driver-matrix/doc/cppDrivers.html#cpp-drivers
 [Home]: http://docs.datastax.com/en/developer/cpp-driver/latest
@@ -198,6 +198,7 @@ specific language governing permissions and limitations under the License.
 [ubuntu-16-04-dependencies]: http://downloads.datastax.com/cpp-driver/ubuntu/16.04/dependencies
 [ubuntu-18-04-dependencies]: http://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies
 [windows-dependencies]: http://downloads.datastax.com/cpp-driver/windows/dependencies
+[DataStax Constellation]: https://constellation.datastax.com
 
 [Asynchronous API]: http://datastax.github.io/cpp-driver/topics/#futures
 [Simple]: http://datastax.github.io/cpp-driver/topics/#executing-queries
diff --git a/cpp-driver/appveyor.yml b/cpp-driver/appveyor.yml
@@ -39,7 +39,7 @@ environment:
   DRIVER_TYPE: CASS
   BOOST_VERSION: 1.69.0
   LIBSSH2_VERSION: 1.9.0
-  LIBUV_VERSION: 1.29.1
+  LIBUV_VERSION: 1.31.0
   OPENSSL_1_0_VERSION: 1.0.2s
   OPENSSL_1_1_VERSION: 1.1.1c
   ZLIB_VERSION: 1.2.11
diff --git a/cpp-driver/build.yaml b/cpp-driver/build.yaml
@@ -19,7 +19,7 @@ os:
   - centos/7-64/cpp
   - osx/high-sierra
 env:
-  LIBUV_VERSION: 1.29.1
+  LIBUV_VERSION: 1.31.0
 build:
   - script: |
       . .build.sh
diff --git a/cpp-driver/cmake/modules/ExternalProject-libuv.cmake b/cpp-driver/cmake/modules/ExternalProject-libuv.cmake
@@ -22,7 +22,7 @@ if(NOT LIBUV_INSTALL_PREFIX)
 endif()
 option(LIBUV_VERSION "libuv version to build and install")
 if(NOT LIBUV_VERSION)
-  set(LIBUV_VERSION "1.29.1")
+  set(LIBUV_VERSION "1.31.0")
 endif()
 set(LIBUV_VERSION ${LIBUV_VERSION} CACHE STRING "libuv version to build and install" FORCE)
 
diff --git a/cpp-driver/docs.yaml b/cpp-driver/docs.yaml
@@ -57,6 +57,8 @@ rules:
   use_path_nav_files_only: true
 
 versions:
+  - name: "2.14"
+    ref: 2.14.0
   - name: "2.13"
     ref: 2.13.0
   - name: "2.12"
diff --git a/cpp-driver/include/cassandra.h b/cpp-driver/include/cassandra.h
@@ -52,9 +52,9 @@
  */
 
 #define CASS_VERSION_MAJOR 2
-#define CASS_VERSION_MINOR 13
+#define CASS_VERSION_MINOR 14
 #define CASS_VERSION_PATCH 0
-#define CASS_VERSION_SUFFIX ""
+#define CASS_VERSION_SUFFIX "alpha"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/cpp-driver/packaging/cassandra_static.pc.in b/cpp-driver/packaging/cassandra_static.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: cassandra
 Description: A C/C++ client driver for Apache Cassandra
 Version: @version@
-Requires: libuv
+Requires: @PC_REQUIRED_LIBS@
 Libs: -L${libdir} -l@PROJECT_LIB_NAME_STATIC@ -lstdc++
 Cflags:
 URL: https://github.com/datastax/cpp-driver/
diff --git a/cpp-driver/src/deque.hpp b/cpp-driver/src/deque.hpp
@@ -28,9 +28,6 @@ class Deque : public std::deque<T, internal::Allocator<T> > {
   template <class InputIt>
   Deque(InputIt first, InputIt last, const Allocator& alloc = Allocator())
       : std::deque<T, Allocator>(first, last, alloc) {}
-
-  Deque(const Deque& other)
-      : std::deque<T, Allocator>(other) {}
 };
 
 }} // namespace datastax::internal
diff --git a/cpp-driver/src/map.hpp b/cpp-driver/src/map.hpp
@@ -25,9 +25,6 @@ class Map
   explicit Map(const Compare& compare = Compare(), const Allocator& alloc = Allocator())
       : std::map<K, V, Compare, Allocator>(compare, alloc) {}
 
-  Map(const Map& other)
-      : std::map<K, V, Compare, Allocator>(other) {}
-
   template <class InputIt>
   Map(InputIt first, InputIt last, const Compare& compare = Compare(),
       const Allocator& alloc = Allocator())
diff --git a/cpp-driver/src/random.cpp b/cpp-driver/src/random.cpp
@@ -53,6 +53,11 @@ Random::~Random() { uv_mutex_destroy(&mutex_); }
 
 uint64_t Random::next(uint64_t max) {
   ScopedMutex l(&mutex_);
+
+  if (max == 0) {
+    return 0;
+  }
+
   const uint64_t limit = CASS_UINT64_MAX - CASS_UINT64_MAX % max;
   uint64_t r;
   do {
diff --git a/cpp-driver/src/vector.hpp b/cpp-driver/src/vector.hpp
@@ -28,9 +28,6 @@ class Vector
   explicit Vector(size_t count, const T& value = T())
       : std::vector<T, Allocator>(count, value) {}
 
-  Vector(const Vector& other)
-      : std::vector<T, Allocator>(other) {}
-
   template <class InputIt>
   Vector(InputIt first, InputIt last)
       : std::vector<T, Allocator>(first, last) {}
diff --git a/docs.yaml b/docs.yaml
@@ -82,12 +82,12 @@ links:
     href:  https://datastax-oss.atlassian.net/browse/CPP
   - title: Mailing List
     href:  https://groups.google.com/a/lists.datastax.com/forum/#!forum/cpp-driver-user
-  - title: Slack
-    href:  https://academy.datastax.com/slack
 rules:
   use_path_nav_files_only: true
 
 versions:
+  - name: "1.10"
+    ref: 1.10.0
   - name: 1.9
     ref: 1.9.0
   - name: 1.8
diff --git a/include/dse.h b/include/dse.h
@@ -49,9 +49,9 @@
  */
 
 #define DSE_VERSION_MAJOR 1
-#define DSE_VERSION_MINOR 9
+#define DSE_VERSION_MINOR 10
 #define DSE_VERSION_PATCH 0
-#define DSE_VERSION_SUFFIX ""
+#define DSE_VERSION_SUFFIX "alpha"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/packaging/dse_static.pc.in b/packaging/dse_static.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: dse
 Description: C/C++ client driver for DataStax Enterprise
 Version: @version@
-Requires: libuv
+Requires: @PC_REQUIRED_LIBS@
 Libs: -L${libdir} -ldse_static -lstdc++
 Cflags:
 URL: https://github.com/datastax/cpp-driver-dse/
