Skip to content

Commit bbbbd7b

Browse files
mikeferomikefero
authored
Merge pull request apache#458 from datastax/2.14.0_prep
2.14.0 release preparation
2 parents 9b30d67 + 076bd23 commit bbbbd7b

File tree

262 files changed

+23328
-1452
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

262 files changed

+23328
-1452
lines changed

‎.build.linux.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ install_openssl() {
5454
true # Already installed on image
5555
}
5656

57+
install_zlib() {
58+
true # Already installed on image
59+
}
60+
5761
install_driver() {(
5862
cd packaging
5963

‎.build.osx.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,16 @@ install_openssl() {
3939
fi
4040
}
4141

42+
install_zlib() {
43+
if brew ls --versions zlib > /dev/null; then
44+
if ! brew outdated zlib; then
45+
brew upgrade zlib
46+
fi
47+
else
48+
brew install zlib
49+
fi
50+
}
51+
4252
install_driver() {
4353
true
4454
}

‎.build.sh‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ else
3535
fi
3636

3737
get_driver_version() {
38-
local header_file=$1
39-
local driver_prefix=$2
38+
local header_file=${1}
39+
local driver_prefix=${2}
4040
local driver_version=$(grep "#define[ \t]\+${driver_prefix}_VERSION_\(MAJOR\|MINOR\|PATCH\|SUFFIX\)" ${header_file} | awk '
4141
BEGIN { major="?"; minor="?"; patch="?" }
4242
/_VERSION_MAJOR/ { major=$3 }
@@ -61,26 +61,37 @@ get_driver_version() {
6161
install_dependencies() {
6262
install_libuv
6363
install_openssl
64+
install_zlib
6465
}
6566

6667
build_driver() {
67-
local driver_prefix=$1
68+
local driver_prefix=${1}
6869

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

7374
(
7475
cd build
75-
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 ..
76+
BUILD_INTEGRATION_TESTS=Off
77+
if [ "${CI_INTEGRATION_ENABLED}" == "true" ]; then
78+
BUILD_INTEGRATION_TESTS=On
79+
fi
80+
cmake -DCMAKE_BUILD_TYPE=Release \
81+
-D${driver_prefix}_BUILD_SHARED=On \
82+
-D${driver_prefix}_BUILD_STATIC=On \
83+
-D${driver_prefix}_BUILD_EXAMPLES=On \
84+
-D${driver_prefix}_BUILD_UNIT_TESTS=On \
85+
-D${driver_prefix}_BUILD_INTEGRATION_TESTS=${BUILD_INTEGRATION_TESTS} \
86+
..
7687
[[ -x $(which clang-format) ]] && make format-check
7788
make -j${PROCS}
7889
)
7990
}
8091

8192
check_driver_exports() {(
8293
set +e #Disable fail fast for this subshell
83-
local driver_library=$1
94+
local driver_library=${1}
8495
if [ -f ${driver_library} ]; then
8596
declare -a MISSING_FUNCTIONS
8697
for function in "${@:2}"; do

‎CHANGELOG.md‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,61 @@
1+
2.14.0
2+
===========
3+
4+
Bug Fixes
5+
--------
6+
* [CPP-819] - Ensure port is updated on already assigned contact points
7+
* [CPP-825] - Cloud should be verifying the peer certificates CN
8+
9+
2.14.0-alpha2
10+
===========
11+
12+
Features
13+
--------
14+
* [CPP-812] - Enable warnings for implicit casts and fix problems
15+
* [CPP-813] - Detect CaaS and change consistency default
16+
* [CPP-817] - Provide error if mixed usage of secure connect bundle and contact points/ssl context
17+
18+
Bug Fixes
19+
--------
20+
* [CPP-802] - Handle prepared id mismatch when repreparing on the fly
21+
* [CPP-815] - Schema agreement fails with SNI
22+
* [CPP-811] - Requests won't complete if they exceed the number of streams on a connection
23+
24+
2.14.0-alpha
25+
===========
26+
27+
Features
28+
--------
29+
* [CPP-787] DataStax cloud platform
30+
* [CPP-788] Support SNI at connection level using `host_id` as host name
31+
* [CPP-793] Add SNI support to `SocketConnector` and SSL backend
32+
* [CPP-794] Add domain name resolution to `SocketConnector`
33+
* [CPP-795] Replace `Address` with endpoint or host type on connection path
34+
* [CPP-797] Events need to map from affected node address to `host_id`
35+
* [CPP-800] Node discovery should use the `host_id` (and endpoint address) instead of the
36+
node's rpc_address
37+
* [CPP-790] Configuration API for DBaaS
38+
* [CPP-791] Add creds.zip support for automatic configuration
39+
* [CPP-798] Configure authentication and SSL from secure connection bundle configuration
40+
* [CPP-799] Use metadata service to determine contact points
41+
* [CPP-788] Support SNI at connection level using `host_id` as host name
42+
* [CPP-803] Propagate `local_dc` from `CloudClusterMetadataResolver` to load balancing policies
43+
44+
Bug Fixes
45+
--------
46+
* [CPP-786] Fix TLS 1.3 support
47+
* [CPP-806] Fix handling of no contact points
48+
49+
Other
50+
--------
51+
* [CPP-796] Correct compiler flags for mixed C and C++ projects
52+
53+
Community
54+
--------
55+
* [CPP-754] Broken build with GCC 9 (eevans)
56+
* Add openssl to the required library list in pkg_config file (accelerated)
57+
* Allow random to work with 0 (joeyhub)
58+
159
2.13.0
260
===========
361

‎CMakeLists.txt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ option(CASS_USE_OPENSSL "Use OpenSSL" ON)
4343
option(CASS_USE_STATIC_LIBS "Link static libraries when building executables" OFF)
4444
option(CASS_USE_STD_ATOMIC "Use C++11 atomics library" OFF)
4545
option(CASS_USE_TCMALLOC "Use tcmalloc" OFF)
46-
option(CASS_USE_ZLIB "Use zlib" OFF)
46+
option(CASS_USE_ZLIB "Use zlib" ON)
4747
option(CASS_USE_TIMERFD "Use timerfd (Linux only)" ON)
4848

4949
# Handle testing dependencies
@@ -108,8 +108,6 @@ CassAddIncludes()
108108
CassFindSourceFiles()
109109
CassConfigure()
110110

111-
set(TEST_CXX_FLAGS ${CASS_TEST_CXX_FLAGS})
112-
113111
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
114112
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
115113
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
@@ -177,9 +175,6 @@ CassConfigureTests()
177175
# no need to update CMakeLists.txt!
178176

179177
if(CASS_BUILD_EXAMPLES)
180-
if(CASS_USE_STATIC_LIBS)
181-
set(CASS_EXAMPLE_C_FLAGS "${CASS_EXAMPLE_C_FLAGS} -DCASS_STATIC")
182-
endif()
183178
CassBuildExamples("examples")
184179
endif()
185180

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ provided with the distribution:
5151
* [Reverse DNS] with SSL peer identity verification support
5252
* Randomized contact points
5353
* [Speculative execution]
54+
* Support for [DataStax Constellation] Cloud Data Platform
5455

5556
## Compatibility
5657

@@ -78,7 +79,6 @@ __Disclaimer__: DataStax products do not support big-endian systems.
7879

7980
* JIRA: https://datastax-oss.atlassian.net/browse/CPP
8081
* Mailing List: https://groups.google.com/a/lists.datastax.com/forum/#!forum/cpp-driver-user
81-
* DataStax Academy via Slack: https://academy.datastax.com/slack
8282

8383
## Feedback Requested
8484

@@ -198,6 +198,7 @@ specific language governing permissions and limitations under the License.
198198
[ubuntu-16-04-dependencies]: http://downloads.datastax.com/cpp-driver/ubuntu/16.04/dependencies
199199
[ubuntu-18-04-dependencies]: http://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies
200200
[windows-dependencies]: http://downloads.datastax.com/cpp-driver/windows/dependencies
201+
[DataStax Constellation]: https://constellation.datastax.com
201202
202203
[Asynchronous API]: http://datastax.github.io/cpp-driver/topics/#futures
203204
[Simple]: http://datastax.github.io/cpp-driver/topics/#executing-queries

0 commit comments

Comments
 (0)