Skip to content

Commit 200a68f

Browse files
absurdfarceabsurdfarce
committed
Merge branch '4.x' into cassjava108
2 parents 1662665 + ad7a103 commit 200a68f

File tree

58 files changed

+1062
-194
lines changed

Some content is hidden

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

58 files changed

+1062
-194
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎NOTICE_binary.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ and decompression library written by Adrien Grand. It can be obtained at:
100100
* LICENSE:
101101
* license/LICENSE.lz4.txt (Apache License 2.0)
102102
* HOMEPAGE:
103-
* https://github.com/jpountz/lz4-java
103+
* https://github.com/yawkat/lz4-java
104104

105105
This product optionally depends on 'lzma-java', a LZMA Java compression
106106
and decompression library, which can be obtained at:

‎README.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# Java Driver for Apache Cassandra®
22

3-
:warning: The java-driver has recently been donated by Datastax to The Apache Software Foundation and the Apache Cassandra project. Bear with us as we move assets and coordinates.
4-
53
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
64
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.cassandra/java-driver-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.cassandra/java-driver-core)
75

@@ -67,10 +65,6 @@ remain unchanged, and the new API will look very familiar to 2.x and 3.x users.
6765

6866
See the [upgrade guide](upgrade_guide/) for details.
6967

70-
## Error Handling
71-
72-
See the [Cassandra error handling done right blog](https://www.datastax.com/blog/cassandra-error-handling-done-right) for error handling with the Java Driver for Apache Cassandra™.
73-
7468
## Useful links
7569

7670
* [Manual](manual/)

‎bom/pom.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.apache.cassandra</groupId>
2525
<artifactId>java-driver-parent</artifactId>
26-
<version>4.19.1-SNAPSHOT</version>
26+
<version>4.19.3-SNAPSHOT</version>
2727
</parent>
2828
<artifactId>java-driver-bom</artifactId>
2929
<packaging>pom</packaging>
@@ -33,47 +33,47 @@
3333
<dependency>
3434
<groupId>org.apache.cassandra</groupId>
3535
<artifactId>java-driver-core</artifactId>
36-
<version>4.19.1-SNAPSHOT</version>
36+
<version>4.19.3-SNAPSHOT</version>
3737
</dependency>
3838
<dependency>
3939
<groupId>org.apache.cassandra</groupId>
4040
<artifactId>java-driver-core-shaded</artifactId>
41-
<version>4.19.1-SNAPSHOT</version>
41+
<version>4.19.3-SNAPSHOT</version>
4242
</dependency>
4343
<dependency>
4444
<groupId>org.apache.cassandra</groupId>
4545
<artifactId>java-driver-mapper-processor</artifactId>
46-
<version>4.19.1-SNAPSHOT</version>
46+
<version>4.19.3-SNAPSHOT</version>
4747
</dependency>
4848
<dependency>
4949
<groupId>org.apache.cassandra</groupId>
5050
<artifactId>java-driver-mapper-runtime</artifactId>
51-
<version>4.19.1-SNAPSHOT</version>
51+
<version>4.19.3-SNAPSHOT</version>
5252
</dependency>
5353
<dependency>
5454
<groupId>org.apache.cassandra</groupId>
5555
<artifactId>java-driver-query-builder</artifactId>
56-
<version>4.19.1-SNAPSHOT</version>
56+
<version>4.19.3-SNAPSHOT</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.apache.cassandra</groupId>
6060
<artifactId>java-driver-guava-shaded</artifactId>
61-
<version>4.19.1-SNAPSHOT</version>
61+
<version>4.19.3-SNAPSHOT</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>org.apache.cassandra</groupId>
6565
<artifactId>java-driver-test-infra</artifactId>
66-
<version>4.19.1-SNAPSHOT</version>
66+
<version>4.19.3-SNAPSHOT</version>
6767
</dependency>
6868
<dependency>
6969
<groupId>org.apache.cassandra</groupId>
7070
<artifactId>java-driver-metrics-micrometer</artifactId>
71-
<version>4.19.1-SNAPSHOT</version>
71+
<version>4.19.3-SNAPSHOT</version>
7272
</dependency>
7373
<dependency>
7474
<groupId>org.apache.cassandra</groupId>
7575
<artifactId>java-driver-metrics-microprofile</artifactId>
76-
<version>4.19.1-SNAPSHOT</version>
76+
<version>4.19.3-SNAPSHOT</version>
7777
</dependency>
7878
<dependency>
7979
<groupId>com.datastax.oss</groupId>

‎changelog/README.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,28 @@ under the License.
2121

2222
<!-- Note: contrary to 3.x, insert new entries *first* in their section -->
2323

24+
### 4.19.2
25+
26+
- [bug] CASSJAVA-116: Retry or Speculative Execution with RequestIdGenerator throws "Duplicate Key"
27+
28+
### 4.19.1
29+
30+
- [improvement] CASSJAVA-97: Let users inject an ID for each request and write to the custom payload
31+
- [improvement] CASSJAVA-92: Add Local DC to driver connection info and provide visibility with nodetool clientstats
32+
- [bug] PR 2025: Eliminate lock in ConcurrencyLimitingRequestThrottler
33+
- [improvement] CASSJAVA-89: Fix deprecated table configs in Cassandra 5
34+
- [improvement] PR 2028: Remove unnecessary locking in DefaultNettyOptions
35+
- [improvement] CASSJAVA-102: Fix revapi spurious complaints about optional dependencies
36+
- [improvement] PR 2013: Add SubnetAddressTranslator
37+
- [improvement] CASSJAVA-68: Improve DefaultCodecRegistry.CacheKey#hashCode() to eliminate Object[] allocation
38+
- [improvement] PR 1989: Bump Jackson version to la(te)st 2.13.x, 2.13.5
39+
- [improvement] CASSJAVA-76: Make guava an optional dependency of java-driver-guava-shaded
40+
- [bug] PR 2035: Prevent long overflow in SNI address resolution
41+
- [improvement] CASSJAVA-77: 4.x: Upgrade Netty to 4.1.119
42+
- [improvement] CASSJAVA-40: Driver testing against Java 21
43+
- [improvement] CASSJAVA-90: Update native-protocol
44+
- [improvement] CASSJAVA-80: Support configuration to disable DNS reverse-lookups for SAN validation
45+
2446
### 4.19.0
2547

2648
- [bug] JAVA-3055: Prevent PreparedStatement cache to be polluted if a request is cancelled.

‎core-shaded/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.apache.cassandra</groupId>
2525
<artifactId>java-driver-parent</artifactId>
26-
<version>4.19.1-SNAPSHOT</version>
26+
<version>4.19.3-SNAPSHOT</version>
2727
</parent>
2828
<artifactId>java-driver-core-shaded</artifactId>
2929
<name>Apache Cassandra Java Driver - core with shaded deps</name>
@@ -74,7 +74,7 @@
7474
<optional>true</optional>
7575
</dependency>
7676
<dependency>
77-
<groupId>org.lz4</groupId>
77+
<groupId>at.yawk.lz4</groupId>
7878
<artifactId>lz4-java</artifactId>
7979
<optional>true</optional>
8080
</dependency>

‎core/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.apache.cassandra</groupId>
2525
<artifactId>java-driver-parent</artifactId>
26-
<version>4.19.1-SNAPSHOT</version>
26+
<version>4.19.3-SNAPSHOT</version>
2727
</parent>
2828
<artifactId>java-driver-core</artifactId>
2929
<packaging>bundle</packaging>
@@ -73,7 +73,7 @@
7373
<optional>true</optional>
7474
</dependency>
7575
<dependency>
76-
<groupId>org.lz4</groupId>
76+
<groupId>at.yawk.lz4</groupId>
7777
<artifactId>lz4-java</artifactId>
7878
<optional>true</optional>
7979
</dependency>

‎core/revapi.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7407,6 +7407,11 @@
74077407
{
74087408
"code": "java.method.varargOverloadsOnlyDifferInVarargParameter",
74097409
"justification": "CASSJAVA-102: Migrate revapi config into dedicated config files, ported from pom.xml"
7410+
},
7411+
{
7412+
"code": "java.method.addedToInterface",
7413+
"new": "method java.util.Optional<com.datastax.oss.driver.api.core.tracker.RequestIdGenerator> com.datastax.oss.driver.api.core.context.DriverContext::getRequestIdGenerator()",
7414+
"justification": "CASSJAVA-97: Let users inject an ID for each request and write to the custom payload"
74107415
}
74117416
]
74127417
}

‎core/src/main/java/com/datastax/oss/driver/api/core/config/DefaultDriverOption.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -995,6 +995,12 @@ public enum DefaultDriverOption implements DriverOption {
995995
* <p>Value-type: boolean
996996
*/
997997
SSL_ALLOW_DNS_REVERSE_LOOKUP_SAN("advanced.ssl-engine-factory.allow-dns-reverse-lookup-san"),
998+
/**
999+
* The class of session-wide component that generates request IDs.
1000+
*
1001+
* <p>Value-type: {@link String}
1002+
*/
1003+
REQUEST_ID_GENERATOR_CLASS("advanced.request-id.generator.class"),
9981004
/**
9991005
* An address to always translate all node addresses to that same proxy hostname no matter what IP
10001006
* address a node has, but still using its native transport port.

‎core/src/main/java/com/datastax/oss/driver/api/core/config/TypedDriverOption.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,10 @@ public String toString() {
281281
new TypedDriverOption<>(
282282
DefaultDriverOption.REQUEST_TRACKER_CLASSES, GenericType.listOf(String.class));
283283

284+
/** The class of a session-wide component that generates request IDs. */
285+
public static final TypedDriverOption<String> REQUEST_ID_GENERATOR_CLASS =
286+
new TypedDriverOption<>(DefaultDriverOption.REQUEST_ID_GENERATOR_CLASS, GenericType.STRING);
287+
284288
/** Whether to log successful requests. */
285289
public static final TypedDriverOption<Boolean> REQUEST_LOGGER_SUCCESS_ENABLED =
286290
new TypedDriverOption<>(

0 commit comments

Comments
 (0)