Skip to content

Commit 63ed4ce

Browse files
authored
JAVA-3000 Native protocol docs still list C* 4.0 as unreleased, v5 in beta (#1673)
1 parent f3ff471 commit 63ed4ce

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

manual/core/native_protocol/README.md

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,26 @@ only available with specific protocol versions.
2424
Java driver 4 supports protocol versions 3 to 5. By default, the version is negotiated with the
2525
first node the driver connects to:
2626

27-
| Cassandra version | Negotiated protocol version with driver 4 ¹ |
28-
|---------------------|-------------------------------------------------|
29-
| 2.1.x | v3 |
30-
| 2.2.x | v4 |
31-
| 3.x | v4 |
32-
| 4.x ² | v5 |
27+
| Cassandra version | Negotiated protocol version with driver 4 ¹ |
28+
|-------------------|-------------------------------------------------|
29+
| 2.1.x | v3 |
30+
| 2.2.x | v4 |
31+
| 3.x | v4 |
32+
| 4.x | v5 |
3333

3434
*(1) for previous driver versions, see the [3.x documentation][driver3]*
3535

36-
*(2) at the time of writing, Cassandra 4 is not released yet. Protocol v5 support is still in beta,
37-
and must be enabled explicitly (negotiation will yield v4).*
38-
3936
Since version 4.5.0, the driver can also use DSE protocols when all nodes are running a version of
4037
DSE. The table below shows the protocol matrix for these cases:
4138

4239
| DSE version | Negotiated protocol version with driver 4 |
4340
|---------------------|-------------------------------------------------|
4441
| 4.7/4.8 | v3 |
4542
| 5.0 | v4 |
46-
| 5.1 | DSE_V1 ³ |
47-
| 6.0/6.7/6.8 | DSE_V2 ³ |
43+
| 5.1 | DSE_V1 ² |
44+
| 6.0/6.7/6.8 | DSE_V2 ² |
4845

49-
*(3) DSE Protocols are chosen before other Cassandra native protocols.*
46+
*(2) DSE Protocols are chosen before other Cassandra native protocols.*
5047

5148
### Controlling the protocol version
5249

manual/developer/native_protocol/README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ This part of the code lives in its own project:
99

1010
The protocol specifications are available in
1111
[native-protocol/src/main/resources](https://github.com/datastax/native-protocol/tree/1.x/src/main/resources).
12-
These files originally come from Cassandra, we copy them over for easy access. Note that, if the
13-
latest version is a beta (this is the case for v5 at the time of writing -- September 2019), the
14-
specification might not be up to date. Always compare with the latest revision in
15-
[cassandra/doc](https://github.com/apache/cassandra/tree/trunk/doc).
12+
These files originally come from Cassandra, we copy them over for easy access. Authoritative specifications can
13+
always be found in [cassandra/doc](https://github.com/apache/cassandra/tree/trunk/doc).
1614

1715

1816
For a broad overview of how protocol types are used in the driver, let's step through an example:

0 commit comments

Comments
 (0)