datastax · mikefero · Jul 1, 2019 · Apr 19, 2019 · Apr 19, 2019 · Apr 25, 2019
diff --git a/.build.sh b/.build.sh
@@ -73,6 +73,7 @@ build_driver() {
   (
     cd build
     cmake -DCMAKE_BUILD_TYPE=Release -D${driver_prefix}_BUILD_SHARED=On -D${driver_prefix}_BUILD_STATIC=On -D${driver_prefix}_BUILD_EXAMPLES=On -D${driver_prefix}_BUILD_UNIT_TESTS=On ..
+    [[ -x $(which clang-format) ]] && make format-check
     make -j${PROCS}
   )
 }

diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,27 @@
+---
+BasedOnStyle: LLVM
+Language: Cpp
+Standard: Cpp03
+AccessModifierOffset: -2
+IndentWidth: 2
+TabWidth: 8
+ColumnLimit: 100
+UseTab: Never
+IndentCaseLabels: true
+AlignAfterOpenBracket: true
+AlignEscapedNewlines: Left
+BreakConstructorInitializers: BeforeComma
+AllowShortBlocksOnASingleLine: false
+DerivePointerAlignment: false
+PointerAlignment: Left
+BinPackParameters: true
+BinPackArguments: true
+AllowShortIfStatementsOnASingleLine: true
+CompactNamespaces: true
+AlignOperands: true
+SpacesInContainerLiterals: true
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+Cpp11BracedListStyle: false
+AlwaysBreakTemplateDeclarations: true
+BreakBeforeInheritanceComma: true
+...
diff --git a/.gitignore b/.gitignore
@@ -50,7 +50,7 @@ Testing
 Debug
 demo/cassandra_demo
 test/unit_tests/cassandra_test
-src/cassconfig.hpp
+src/driver_config.hpp
 
 # API docs files
 Doxyfile

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,19 +1,43 @@
+2.13.0
+===========
+
+Features
+--------
+* [CPP-745] Exponential reconnection policy with jitter
+* [CPP-769] Use `clang-format` to fix up formatting
+* [CPP-775] Add `clang-format` to Windows
+
+Other
+--------
+* [CPP-743] Move internal components from `namespace cass` to `namespace datastax::internal`
+* [CPP-764] Rename namespace from `cass` to `datastax`
+* [CPP-766] Allow RPM packaging script to build RPM packages for Amazon Linux
+* [CPP-770] Fix header files include guard (\_\_CASS_XXX to DATASTAX_XXX)
+* [CPP-772] Remove per cpp file LOG_FILE attribute to speed up Windows builds
+
+Community
+--------
+* Fixed the location of the '[in]' information for Doxygen. (AlexisWilke)
+* Added header subdirectory installation capability. (accelerated)
+* Changed pkg_config templates to use the library variable name. (accelerated)
+* Fix generation of shlib deps file for debian packages. (jirkasilhan)
+
 2.12.0
 ===========
 
 Features
 --------
-[CPP-751] Call host listener callback for the initial set of hosts
+* [CPP-751] Call host listener callback for the initial set of hosts
 
 Bug Fixes
 --------
-[CPP-755] UDT metadata not being properly populated/updated
+* [CPP-755] UDT metadata not being properly populated/updated
 
 Other
 --------
-[CPP-705] Deprecate DC-aware multi-DC settings (`used_hosts_per_remote_dc`
-          and `allowRemoteDCsForLocalConsistencyLevel `)
-[CPP-720] Streamline custom allocator
+* [CPP-705] Deprecate DC-aware multi-DC settings (`used_hosts_per_remote_dc`
+            and `allowRemoteDCsForLocalConsistencyLevel `)
+* [CPP-720] Streamline custom allocator
 
 2.11.0
 ===========

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,6 +8,7 @@ set(CASS_INCLUDE_DIR "${CASS_ROOT_DIR}/include")
 list(APPEND CMAKE_MODULE_PATH ${CASS_ROOT_DIR}/cmake/modules)
 
 include(CppDriver)
+include(ClangFormat)
 
 CassInitProject(cassandra)
 CassPolicies()

diff --git a/appveyor.ps1 b/appveyor.ps1
@@ -773,7 +773,7 @@ Function Publish-Artifacts {
     }
 
     # Create the Uri and FilePath components for the upload
-    $base_uri = "$($Env:ARTIFACTORY_BASE_URI)/origin/$($Env:APPVEYOR_REPO_BRANCH)/$(Get-Commit-Sha)/windows"
+    $base_uri = "$($Env:ARTIFACTORY_BASE_URI)/$($Env:DRIVER_VERSION)/$(Get-Commit-Sha)/windows"
     $driver_uri = "$($base_uri)/$($driver_type)/v$($Env:DRIVER_VERSION)/$($Env:DRIVER_ARTIFACT_ARCHIVE)"
     $driver_archive = "$($Env:DRIVER_ARTIFACTS_DIR)/$($Env:DRIVER_ARTIFACT_ARCHIVE)"
     $libuv_uri = "$($base_uri)/dependencies/libuv/v$($Env:LIBUV_VERSION)/$($Env:LIBUV_ARTIFACT_ARCHIVE)"

diff --git a/appveyor.yml b/appveyor.yml
@@ -40,10 +40,10 @@ environment:
   APPVEYOR_IGNORE_COMMIT_FILTERING_ON_TAG: true
   DRIVER_TYPE: CASS
   BOOST_VERSION: 1.69.0
-  LIBSSH2_VERSION: 1.8.2
-  LIBUV_VERSION: 1.28.0
-  OPENSSL_1_0_VERSION: 1.0.2r
-  OPENSSL_1_1_VERSION: 1.1.1b
+  LIBSSH2_VERSION: 1.9.0
+  LIBUV_VERSION: 1.29.1
+  OPENSSL_1_0_VERSION: 1.0.2s
+  OPENSSL_1_1_VERSION: 1.1.1c
   matrix:
     - CMAKE_GENERATOR: Visual Studio 10 2010
       OPENSSL_MAJOR_MINOR: 1.0

diff --git a/build.yaml b/build.yaml
@@ -19,7 +19,7 @@ os:
   - centos/7-64/cpp
   - osx/high-sierra
 env:
-  LIBUV_VERSION: 1.28.0
+  LIBUV_VERSION: 1.29.1
 build:
   - script: |
       . .build.sh

diff --git a/cmake/modules/ClangFormat.cmake b/cmake/modules/ClangFormat.cmake
@@ -0,0 +1,109 @@
+#
+# Format and verify formatting using clang-format
+#
+cmake_minimum_required(VERSION 2.6.4)
+
+include(FindPackageHandleStandardArgs)
+
+if(NOT CLANG_FORMAT_EXE_NAME)
+  set(CLANG_FORMAT_EXE_NAME clang-format)
+endif()
+
+if(CLANG_FORMAT_ROOT_DIR)
+  find_program(CLANG_FORMAT_EXE
+    NAMES ${CLANG_FORMAT_EXE_NAME}
+    PATHS ${CLANG_FORMAT_ROOT_DIR}
+    NO_DEFAULT_PATH)
+endif()
+
+find_program(CLANG_FORMAT_EXE NAMES ${CLANG_FORMAT_EXE_NAME})
+
+find_package_handle_standard_args(CLANG_FORMAT DEFAULT_MSG CLANG_FORMAT_EXE)
+
+mark_as_advanced(CLANG_FORMAT_EXE)
+
+if(CLANG_FORMAT_FOUND)
+  set(CLANG_FORMAT_FILE_EXTENSIONS ${CLANG_FORMAT_CXX_FILE_EXTENSIONS} *.cpp *.hpp *.c *.h)
+  file(GLOB_RECURSE CLANG_FORMAT_ALL_SOURCE_FILES ${CLANG_FORMAT_FILE_EXTENSIONS})
+
+  set(CLANG_FORMAT_EXCLUDE_PATTERNS ${CLANG_FORMAT_EXCLUDE_PATTERNS} "/CMakeFiles/" "cmake" "/build/" "/vendor/" "/third_party/" "cassandra.h" "dse.h")
+
+  foreach(SOURCE_FILE ${CLANG_FORMAT_ALL_SOURCE_FILES})
+    foreach(EXCLUDE_PATTERN ${CLANG_FORMAT_EXCLUDE_PATTERNS})
+      string(FIND ${SOURCE_FILE} ${EXCLUDE_PATTERN} EXCLUDE_FOUND)
+      if(NOT ${EXCLUDE_FOUND} EQUAL -1)
+        list(REMOVE_ITEM CLANG_FORMAT_ALL_SOURCE_FILES ${SOURCE_FILE})
+      endif()
+    endforeach()
+  endforeach()
+
+  if(WIN32)
+    set(CLANG_FORMAT_FILENAME "clang-format.files")
+    set(CLANG_FORMAT_ABSOLUTE_FILENAME "${CMAKE_BINARY_DIR}/${CLANG_FORMAT_FILENAME}")
+    if (EXISTS ${CLANG_FORMAT_ABSOLUTE_FILENAME})
+      file(REMOVE ${CLANG_FORMAT_ABSOLUTE_FILENAME})
+    endif()
+
+    set(COUNT 1)
+    file(TO_NATIVE_PATH ${CMAKE_BINARY_DIR} CMAKE_WINDOWS_BINARY_DIR)
+    foreach(SOURCE_FILE ${CLANG_FORMAT_ALL_SOURCE_FILES})
+      file(RELATIVE_PATH RELATIVE_SOURCE_FILE ${CMAKE_BINARY_DIR} ${SOURCE_FILE})
+      file(TO_NATIVE_PATH ${RELATIVE_SOURCE_FILE} NATIVE_RELATIVE_SOURCE_FILE)
+
+      if(COUNT EQUAL 50)
+        file(APPEND ${CLANG_FORMAT_ABSOLUTE_FILENAME} " ${NATIVE_RELATIVE_SOURCE_FILE}\n")
+        set(COUNT 1)
+      else()
+        file(APPEND ${CLANG_FORMAT_ABSOLUTE_FILENAME} " ${NATIVE_RELATIVE_SOURCE_FILE}")
+        MATH(EXPR COUNT "${COUNT} + 1")
+      endif()
+    endforeach()
+
+    file(TO_NATIVE_PATH ${CLANG_FORMAT_EXE} CLANG_FORMAT_EXE)
+    file(WRITE "${CMAKE_BINARY_DIR}/clang-format-windows.bat"
+               "@REM Generated clang-format script for Windows\r\n"
+               "@ECHO OFF\r\n"
+               "SETLOCAL ENABLEDELAYEDEXPANSION\r\n"
+               "SET IS_FAILED_CHECK=0\r\n"
+               "PUSHD ${CMAKE_WINDOWS_BINARY_DIR}>NUL\r\n"
+               "FOR /F \"TOKENS=*\" %%A IN (${CLANG_FORMAT_FILENAME}) do (\r\n"
+               "  IF %1 EQU 1 (\r\n"
+               "    \"${CLANG_FORMAT_EXE}\" -i -fallback-style=none -style=file %%A\r\n"
+               "    IF NOT !ERRORLEVEL! EQU 0 (\r\n"
+               "      SET IS_FAILED_CHECK=1\r\n"
+               "    )\r\n"
+               "  )\r\n"
+               "  IF %1 EQU 2 (\r\n"
+               "    \"${CLANG_FORMAT_EXE}\" -output-replacements-xml -fallback-style=none -style=file %%A 2>&1 | FINDSTR /C:\"replacement offset\">NUL\r\n"
+               "    IF !ERRORLEVEL! EQU 0 (\r\n"
+               "      SET IS_FAILED_CHECK=1\r\n"
+               "    )\r\n"
+               "  )\r\n"
+               ")\r\n"
+               "IF NOT !IS_FAILED_CHECK! EQU 0 (\r\n"
+               "  POPD\r\n"
+               "  EXIT /B 1\r\n"
+               ")\r\n"
+               "POPD\r\n"
+               "ENDLOCAL\r\n"
+               "EXIT /B 0\r\n")
+
+    add_custom_target(format
+      COMMENT "Format source files using clang-format"
+      COMMAND "${CMAKE_WINDOWS_BINARY_DIR}\\clang-format-windows.bat" 1)
+
+    add_custom_target(format-check
+      COMMENT "Verify source files formatting using clang-format"
+      COMMAND "${CMAKE_WINDOWS_BINARY_DIR}\\clang-format-windows.bat" 2)
+  else()
+    add_custom_target(format
+      COMMENT "Format source files using clang-format"
+      COMMAND ${CLANG_FORMAT_EXE} -i -fallback-style=none -style=file ${CLANG_FORMAT_ALL_SOURCE_FILES})
+
+    add_custom_target(format-check
+      COMMENT "Verify source files formatting using clang-format"
+      COMMAND ! ${CLANG_FORMAT_EXE} -output-replacements-xml -fallback-style=none -style=file ${CLANG_FORMAT_ALL_SOURCE_FILES} | tee replacements.xml | grep -q "replacement offset")
+  endif()
+else()
+  message(STATUS "Unable to find clang-format. Not creating format targets.")
+endif()
diff --git a/cmake/modules/CppDriver.cmake b/cmake/modules/CppDriver.cmake
@@ -810,25 +810,6 @@ macro(CassSetCompilerFlags)
       add_definitions("/MP")
     endif()
 
-    # Enable link time optimization for all MSVC build configurations
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL")
-    set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /LTCG")
-    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG")
-    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG")
-
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /GL")
-    string(REGEX REPLACE "[-/]INCREMENTAL" "/INCREMENTAL:NO" CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO}")
-    set(CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
-    string(REGEX REPLACE "[-/]INCREMENTAL" "/INCREMENTAL:NO" CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO}")
-    set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
-    string(REGEX REPLACE "[-/]INCREMENTAL" "/INCREMENTAL:NO" CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO}")
-    set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /LTCG")
-
-    set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /GL")
-    set(CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL "${CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL} /LTCG")
-    set(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "${CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL} /LTCG")
-    set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} /LTCG")
-
     # On Visual C++ -pedantic flag is not used,
     # -fPIC is not used on Windows platform (all DLLs are
     # relocable), -Wall generates about 30k stupid warnings
@@ -1001,18 +982,12 @@ macro(CassFindSourceFiles)
   endif()
 
   set(CASS_ALL_SOURCE_FILES ${CASS_SRC_FILES} ${CASS_API_HEADER_FILES} ${CASS_INC_FILES})
-
-  # Shorten the source file pathing for log messages
-  foreach(SRC_FILE ${CASS_SRC_FILES})
-    string(REPLACE "${CASS_ROOT_DIR}/" "" LOG_FILE_ ${SRC_FILE})
-    set_source_files_properties(${SRC_FILE} PROPERTIES COMPILE_FLAGS -DLOG_FILE_=\\\"${LOG_FILE_}\\\")
-  endforeach()
 endmacro()
 
 #------------------------
 # CassConfigure
 #
-# Generate cassconfig.hpp from cassconfig.hpp.in
+# Generate driver_config.hpp from driver_config.hpp.in
 #
 # Input: CASS_ROOT_DIR, CASS_SRC_DIR
 #------------------------
@@ -1048,6 +1023,6 @@ macro(CassConfigure)
     check_cxx_source_compiles("int main() { return __builtin_bswap64(42); }" HAVE_BUILTIN_BSWAP64)
   endif()
 
-  # Generate the cassconfig.hpp file
-  configure_file(${CASS_ROOT_DIR}/cassconfig.hpp.in ${CASS_SRC_DIR}/cassconfig.hpp)
+  # Generate the driver_config.hpp file
+  configure_file(${CASS_ROOT_DIR}/driver_config.hpp.in ${CASS_SRC_DIR}/driver_config.hpp)
 endmacro()
diff --git a/cmake/modules/ExternalProject-OpenSSL.cmake b/cmake/modules/ExternalProject-OpenSSL.cmake
@@ -21,8 +21,8 @@ endif()
 # OpenSSL related CMake options
 option(OPENSSL_VERSION "OpenSSL version to build and install")
 if(NOT OPENSSL_VERSION)
-  # TODO: Should we default to OpenSSL 1.1 (e.g. 1.1.1b)?
-  set(OPENSSL_VERSION "1.0.2r")
+  # TODO: Should we default to OpenSSL 1.1 (e.g. 1.1.1c)?
+  set(OPENSSL_VERSION "1.0.2s")
 endif()
 option(OPENSSL_INSTALL_PREFIX "OpenSSL installation prefix location")
 if(CASS_USE_ZLIB)

diff --git a/cmake/modules/ExternalProject-libssh2.cmake b/cmake/modules/ExternalProject-libssh2.cmake
@@ -22,7 +22,7 @@ if(NOT LIBSSH2_INSTALL_PREFIX)
 endif()
 option(LIBSSH2_VERSION "libssh2 version to build and install")
 if(NOT LIBSSH2_VERSION)
-  set(LIBSSH2_VERSION "1.8.2")
+  set(LIBSSH2_VERSION "1.9.0")
 endif()
 set(LIBSSH2_VERSION ${LIBSSH2_VERSION} CACHE STRING "libssh2 version to build and install" FORCE)
 

diff --git a/cmake/modules/ExternalProject-libuv.cmake b/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.28.0")
+  set(LIBUV_VERSION "1.29.1")
 endif()
 set(LIBUV_VERSION ${LIBUV_VERSION} CACHE STRING "libuv version to build and install" FORCE)
 

diff --git a/docs.yaml b/docs.yaml
@@ -52,10 +52,13 @@ rewrites:
   - ^examples/(.*): https://github.com/datastax/cpp-driver/blob/master/examples/\1
   - http://www.datastax.com/documentation/cql/3.1: https://docs.datastax.com/en/archived/cql/3.1
   - http://www.datastax.com/documentation/cassandra/2.: https://docs.datastax.com/en/archived/cassandra/2.
+  - http://downloads.datastax.com/cpp-driver: https://downloads.datastax.com/cpp-driver/
 rules:
   use_path_nav_files_only: true
 
 versions:
+  - name: "2.13"
+    ref: 2.13.0
   - name: "2.12"
     ref: 2.12.0
   - name: "2.11"

diff --git a/cassconfig.hpp.in → driver_config.hpp.in b/cassconfig.hpp.in → driver_config.hpp.in
@@ -1,5 +1,5 @@
-#ifndef __CASSANDRA_CONFIG_HPP_INCLUDED__
-#define __CASSANDRA_CONFIG_HPP_INCLUDED__
+#ifndef DATASTAX_INTERNAL_DRIVER_CONFIG_HPP
+#define DATASTAX_INTERNAL_DRIVER_CONFIG_HPP
 
 #cmakedefine HAVE_OPENSSL
 #cmakedefine HAVE_STD_ATOMIC

diff --git a/examples/async/async.c b/examples/async/async.c
@@ -26,9 +26,9 @@
 */
 
 #include <assert.h>
-#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "cassandra.h"
 
@@ -41,7 +41,6 @@ void print_error(CassFuture* future) {
   fprintf(stderr, "Error: %.*s\n", (int)message_length, message);
 }
 
-
 CassCluster* create_cluster(const char* hosts) {
   CassCluster* cluster = cass_cluster_new();
   cass_cluster_set_contact_points(cluster, hosts);
@@ -90,7 +89,7 @@ void insert_into_async(CassSession* session, const char* key) {
 
   size_t i;
   for (i = 0; i < NUM_CONCURRENT_REQUESTS; ++i) {
-     char key_buffer[64];
+    char key_buffer[64];
     statement = cass_statement_new(query, 6);
 
     sprintf(key_buffer, "%s%u", key, (unsigned int)i);
@@ -135,13 +134,10 @@ int main(int argc, char* argv[]) {
     return -1;
   }
 
-  execute_query(session,
-                "CREATE KEYSPACE examples WITH replication = { \
+  execute_query(session, "CREATE KEYSPACE examples WITH replication = { \
                            'class': 'SimpleStrategy', 'replication_factor': '3' };");
 
-
-  execute_query(session,
-                "CREATE TABLE examples.async (key text, \
+  execute_query(session, "CREATE TABLE examples.async (key text, \
                                               bln boolean, \
                                               flt float, dbl double,\
                                               i32 int, i64 bigint, \