Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
6ca09e1
Merge remote-tracking branch 'core/master' into sync_core
Jul 2, 2019
6697938
Merge pull request #260 from riptano/sync_core
mikefero Jul 2, 2019
74056c2
CPP-786 - Disable TLS v1.3 support in mockssandra (#262)
Jul 3, 2019
c3f0e89
CPP-786 Simplify DH/RSA parameter generation in mockssandra (#264)
mpenick Jul 15, 2019
0605e26
CPP-786 Fix TLS v1.3 support (#265)
mpenick Jul 18, 2019
ca16ca8
CPP-796 - Fixing compiler flags for mixed C and C++ code
Jul 24, 2019
19f9d04
CPP-795 Add hostname and SNI support to `Address` (#270)
mpenick Jul 30, 2019
4904bd5
CPP-791 - Process creds.zip for automatic cloud secure connection con…
mikefero Jul 30, 2019
3f8136a
Merge pull request #268 from riptano/CPP-796
mikefero Jul 30, 2019
893f338
CPP-793 Add SNI support to `SocketConnector` and SSL backend
Jul 29, 2019
d43159e
CPP-794 Add domain name resolution to `SocketConnector` (#271)
mpenick Jul 30, 2019
b906e55
Remove WSL testing from CCM bridge
Jul 31, 2019
3807ada
Move DSE plaintext authentication into the core driver
Aug 5, 2019
8fcb5a9
CPP-798 Configure auth/SSL from secure connection bundle configuration
Aug 5, 2019
cf0f0e1
Use constant for DSE authenticator
Aug 5, 2019
5d4e044
nit: spacing
Aug 5, 2019
361d3a6
Add tests
Aug 6, 2019
f60178d
Fix build (on non-c++11 compilers)
Aug 6, 2019
bacce8e
CPP-797/CPP-800 Node discovery should use `host_id` and add mapping f…
mpenick Aug 13, 2019
fb222ad
Merge pull request #273 from riptano/CPP-798
mpenick Aug 13, 2019
c99ffac
CPP-792 - Add CI support for Visual Studio 2019
Jul 18, 2019
971f6f0
CPP-804 - Remove 32-bit Windows builds
Aug 15, 2019
5a33e19
Merge pull request #266 from riptano/CPP-792
mikefero Aug 19, 2019
d36334f
CPP-799 - Use metadata service to determine contact points
Jul 31, 2019
3d880bc
Fix strict weak ordering of `Address` (#277)
mpenick Aug 26, 2019
248a359
test: Fixing up intermittent failing session test
Aug 14, 2019
de129e5
CPP-799 Handle HTTP client request timeouts (#276)
mpenick Aug 26, 2019
927b64a
Merge pull request #274 from riptano/CPP-799
mikefero Aug 26, 2019
1d2a7a7
CPP-803 - Propagate `local_dc` from `CloudClusterMetadataResolver`
Aug 16, 2019
1a5a4c6
Adding tests to validate propagating local datacenter
Aug 16, 2019
fb33796
Use ref
Aug 26, 2019
11be33e
Fixing local_dc_ assignment and addressing review comments
Aug 28, 2019
8dfc597
CPP-807 - Handle varying encoded UTF configuration files (#281)
mikefero Aug 29, 2019
1796159
CPP-806 Fix handling of no contact points (#280)
mpenick Aug 29, 2019
955da66
Expand comment on DC aware local DC override
Aug 29, 2019
694ad18
Merge branch 'master' into CPP-803
Aug 29, 2019
7fc5478
Fix formatting
Aug 29, 2019
2e7e57f
Merge pull request #275 from riptano/CPP-803
mpenick Aug 29, 2019
644d017
Cloud example and fixes (#282)
mpenick Sep 3, 2019
12abd5e
Add back secure bundle based authentication to cloud (#283)
mpenick Sep 3, 2019
9f82c86
Fixing no_ssl_lib_init and removing keyspace
Sep 3, 2019
166979f
test: CPP-787 - Integration tests for DBaaS
Sep 3, 2019
71855dd
test: CPP-787 - CI run for DBaaS integration test
Sep 3, 2019
129b2bf
Merge pull request #279 from riptano/CPP-787/test
mikefero Sep 4, 2019
2bdfc7b
Merge remote-tracking branch 'core/master' into 1.10.0_alpha_prep
Sep 4, 2019
5732b7f
Add openssl to the required library list in pkg_config file
Sep 4, 2019
ab2af5d
Updating version, changelog, and dependency versions
Sep 4, 2019
2f61108
Merge pull request #284 from riptano/1.10.0_alpha_prep
mikefero Sep 4, 2019
329aa3a
Merge remote-tracking branch 'dse/master' into 2.14.0_alpha_prep
Sep 4, 2019
e6165be
Fixing debian packaging for versions with suffix
Sep 4, 2019
4f0286b
Merge pull request #285 from riptano/fix_debian_packaging
mikefero Sep 4, 2019
df16f3d
Merge remote-tracking branch 'dse/master' into 2.14.0_alpha_prep
Sep 4, 2019
aef8670
Merge pull request #1 from riptano/2.14.0_alpha_prep
mikefero Sep 4, 2019
ec5c814
test: Stabilize chaotic session unit tests
Sep 9, 2019
e2ed3b2
test: CPP-805 - Correcting integration tests for DSE (#286)
mikefero Sep 12, 2019
14af6ae
Merge pull request #288 from riptano/stabilize_session_unit_tests
mikefero Sep 13, 2019
951a3b2
Run clang-format
Sep 18, 2019
34bc1ed
test: CPP-814 - Move DBaaS integration test into nightly schedule
Sep 18, 2019
f933e2d
Merge pull request #289 from riptano/CPP-814
mikefero Oct 2, 2019
744310e
CPP-813 - Detect CaaS and change consistency defaults
Sep 19, 2019
551abd4
CPP-815 - Correcting schema agreement with SNI/DBaaS clusters
Sep 23, 2019
a4292a0
Merge pull request #291 from riptano/CPP-815
mikefero Oct 5, 2019
b6a7b0a
Merge pull request #290 from riptano/CPP-813
mikefero Oct 7, 2019
8aa930c
CPP-801 - Verify the driver handles NULLs in collections
Oct 7, 2019
8aeea5e
CPP-817 - Provide error if override attempt of cloud bundle or contct…
mikefero Oct 8, 2019
d9c9f29
CPP-818 - Add configuration properties to Insights startup message
Oct 8, 2019
3e617e7
Merge pull request #297 from riptano/CPP-818
mikefero Oct 10, 2019
1b55f24
CPP-816 - Add quickstart guide for Constellation (#296)
mikefero Oct 10, 2019
115a9e5
Merge pull request #295 from riptano/CPP-801
mikefero Oct 10, 2019
36d054e
CPP-811 Requests won't complete if they exceed the number of streams …
mpenick Oct 10, 2019
cf9dddb
CPP-802 - Handle prepared id mismatch when repreparing on the fly
Oct 9, 2019
6165cd9
CPP-812 - Enable warnings for implicit casts and address problems (#292)
mikefero Oct 11, 2019
39aa242
Updating version, changelog, and dependency versions
Oct 10, 2019
915f176
Merge pull request #299 from riptano/1.10.0-alpha-2_prep
mikefero Oct 11, 2019
d2775a5
Merge remote-tracking branch 'dse/master' into 2.14.0-alpha-2_prep
Oct 11, 2019
8a5453b
Fix release version number (#300)
mikefero Oct 14, 2019
e7d37ac
Merge remote-tracking branch 'dse/master' into 2.14.0-alpha-2_prep
Oct 14, 2019
d146f00
Merge pull request #2 from riptano/2.14.0-alpha-2_prep
mikefero Oct 15, 2019
4cfb670
ci: Fixing integration test builds and runs
Oct 15, 2019
35f9992
Merge pull request #301 from riptano/fix_ci_builds
mikefero Oct 15, 2019
b892963
Merge remote-tracking branch 'dse/master' into fix_ci_builds
Oct 15, 2019
3dd6cf9
Merge pull request #3 from riptano/fix_ci_builds
mikefero Oct 15, 2019
8dd752c
CPP-819 - Ensure port is updated on already assigned contact points (…
mikefero Oct 17, 2019
56b7caa
CPP-811 Add unit tests for request handler changes (#302)
mpenick Oct 17, 2019
5169071
test: CPP-820: Adding the ability to run against DDAC using CCM (#304)
mikefero Oct 18, 2019
9b0769f
test: Correcting integration test category grouping
Apr 22, 2019
9ba2f91
test: Stabalize control connection tests
Oct 17, 2019
a40c521
test: Disable migrated Boost tests
Apr 23, 2019
3efe29c
Updating version, changelog, and dependency versions
Oct 18, 2019
b707550
test: Ensuring invalid YAML property is not propagated to Cassandra
Oct 21, 2019
19b5c63
Merge pull request #306 from riptano/1.10.0_prep
mikefero Oct 21, 2019
3187111
test: Re-run clang-format
Oct 21, 2019
f5b008f
Merge pull request #307 from riptano/clang_format
mikefero Oct 21, 2019
8600604
CPP-825 Cloud should be verifying the peer certificate's CN (#308)
mpenick Oct 23, 2019
d0bc4bc
doc: Correct broken document links for all versions of the driver (#309)
mikefero Oct 24, 2019
302ade2
Merge remote-tracking branch 'dse/master' into 2.14.0_prep
Oct 24, 2019
0ef2e58
Merge pull request #4 from riptano/2.14.0_prep
mikefero Oct 25, 2019
c4438fb
Add missing JIRA ticket to changelog
Oct 25, 2019
4387580
Merge pull request #310 from riptano/update_changelogs
mikefero Oct 25, 2019
076bd23
Merge remote-tracking branch 'dse/master'
Oct 25, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .build.linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ install_openssl() {
true # Already installed on image
}

install_zlib() {
true # Already installed on image
}

install_driver() {(
cd packaging

Expand Down
10 changes: 10 additions & 0 deletions .build.osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@ install_openssl() {
fi
}

install_zlib() {
if brew ls --versions zlib > /dev/null; then
if ! brew outdated zlib; then
brew upgrade zlib
fi
else
brew install zlib
fi
}

install_driver() {
true
}
Expand Down
21 changes: 16 additions & 5 deletions .build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ else
fi

get_driver_version() {
local header_file=$1
local driver_prefix=$2
local header_file=${1}
local driver_prefix=${2}
local driver_version=$(grep "#define[ \t]\+${driver_prefix}_VERSION_\(MAJOR\|MINOR\|PATCH\|SUFFIX\)" ${header_file} | awk '
BEGIN { major="?"; minor="?"; patch="?" }
/_VERSION_MAJOR/ { major=$3 }
Expand All @@ -61,26 +61,37 @@ get_driver_version() {
install_dependencies() {
install_libuv
install_openssl
install_zlib
}

build_driver() {
local driver_prefix=$1
local driver_prefix=${1}

# Ensure build directory is cleaned (static nodes are not cleaned)
[[ -d build ]] && rm -rf build
mkdir build

(
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 ..
BUILD_INTEGRATION_TESTS=Off
if [ "${CI_INTEGRATION_ENABLED}" == "true" ]; then
BUILD_INTEGRATION_TESTS=On
fi
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 \
-D${driver_prefix}_BUILD_INTEGRATION_TESTS=${BUILD_INTEGRATION_TESTS} \
..
[[ -x $(which clang-format) ]] && make format-check
make -j${PROCS}
)
}

check_driver_exports() {(
set +e #Disable fail fast for this subshell
local driver_library=$1
local driver_library=${1}
if [ -f ${driver_library} ]; then
declare -a MISSING_FUNCTIONS
for function in "${@:2}"; do
Expand Down
58 changes: 58 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,61 @@
2.14.0
===========

Bug Fixes
--------
* [CPP-819] - Ensure port is updated on already assigned contact points
* [CPP-825] - Cloud should be verifying the peer certificates CN

2.14.0-alpha2
===========

Features
--------
* [CPP-812] - Enable warnings for implicit casts and fix problems
* [CPP-813] - Detect CaaS and change consistency default
* [CPP-817] - Provide error if mixed usage of secure connect bundle and contact points/ssl context

Bug Fixes
--------
* [CPP-802] - Handle prepared id mismatch when repreparing on the fly
* [CPP-815] - Schema agreement fails with SNI
* [CPP-811] - Requests won't complete if they exceed the number of streams on a connection

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
===========

Expand Down
7 changes: 1 addition & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ option(CASS_USE_OPENSSL "Use OpenSSL" ON)
option(CASS_USE_STATIC_LIBS "Link static libraries when building executables" OFF)
option(CASS_USE_STD_ATOMIC "Use C++11 atomics library" OFF)
option(CASS_USE_TCMALLOC "Use tcmalloc" OFF)
option(CASS_USE_ZLIB "Use zlib" OFF)
option(CASS_USE_ZLIB "Use zlib" ON)
option(CASS_USE_TIMERFD "Use timerfd (Linux only)" ON)

# Handle testing dependencies
Expand Down Expand Up @@ -108,8 +108,6 @@ CassAddIncludes()
CassFindSourceFiles()
CassConfigure()

set(TEST_CXX_FLAGS ${CASS_TEST_CXX_FLAGS})

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
Expand Down Expand Up @@ -177,9 +175,6 @@ CassConfigureTests()
# no need to update CMakeLists.txt!

if(CASS_BUILD_EXAMPLES)
if(CASS_USE_STATIC_LIBS)
set(CASS_EXAMPLE_C_FLAGS "${CASS_EXAMPLE_C_FLAGS} -DCASS_STATIC")
endif()
CassBuildExamples("examples")
endif()

Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
Loading