Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions changelog/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ under the License.

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

### 4.19.2.2

- [breaking] Remove DSE Graph execution support and TinkerPop integration; deprecated Graph API
shells and legacy configuration remain temporarily for migration (#1028)

### 4.19.2

- [bug] CASSJAVA-116: Retry or Speculative Execution with RequestIdGenerator throws "Duplicate Key"
Expand Down
21 changes: 6 additions & 15 deletions core-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,12 @@
<artifactId>esri-geometry-api</artifactId>
<optional>true</optional>
</dependency>
<!-- Required only by deprecated Graph API signatures; no Graph implementation remains. -->
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-core</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkergraph-gremlin</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams</artifactId>
Expand Down Expand Up @@ -317,20 +313,15 @@
<version>${lz4.version}</version>
</additionalDependency>
<additionalDependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-core</artifactId>
<version>${tinkerpop.version}</version>
<groupId>com.esri.geometry</groupId>
<artifactId>esri-geometry-api</artifactId>
<version>${esri.version}</version>
</additionalDependency>
<additionalDependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkergraph-gremlin</artifactId>
<artifactId>gremlin-core</artifactId>
<version>${tinkerpop.version}</version>
</additionalDependency>
<additionalDependency>
<groupId>com.esri.geometry</groupId>
<artifactId>esri-geometry-api</artifactId>
<version>${esri.version}</version>
</additionalDependency>
</additionalDependencies>
</configuration>
</execution>
Expand Down Expand Up @@ -375,7 +366,7 @@
Note: dependencies marked as optional are by default included with optional
resolution in the manifest; we only need to manually set the resolution to
optional for dependencies declared as non-optional in the pom files.
-->jnr.*;resolution:=optional, com.esri.core.geometry.*;resolution:=optional,org.reactivestreams.*;resolution:=optional, org.apache.tinkerpop.*;resolution:=optional, org.javatuples.*;resolution:=optional, reactor.blockhound.*;resolution:=optional,
-->jnr.*;resolution:=optional, com.esri.core.geometry.*;resolution:=optional,org.reactivestreams.*;resolution:=optional, org.apache.tinkerpop.*;resolution:=optional, reactor.blockhound.*;resolution:=optional,
<!--
5) Don't import packages imported by shaded classes, if they are not used by the
driver bundle.
Expand Down
8 changes: 2 additions & 6 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,12 @@
<artifactId>esri-geometry-api</artifactId>
<optional>true</optional>
</dependency>
<!-- Required only by deprecated Graph API signatures; no Graph implementation remains. -->
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-core</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkergraph-gremlin</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
Expand Down Expand Up @@ -324,7 +320,7 @@
Note: dependencies marked as optional are by default included with optional
resolution in the manifest; we only need to manually set the resolution to
optional for dependencies declared as non-optional in the pom files.
-->jnr.*;resolution:=optional, com.esri.core.geometry.*;resolution:=optional, org.reactivestreams.*;resolution:=optional, org.apache.tinkerpop.*;resolution:=optional, org.javatuples.*;resolution:=optional, reactor.blockhound.*;resolution:=optional, *
-->jnr.*;resolution:=optional, com.esri.core.geometry.*;resolution:=optional, org.reactivestreams.*;resolution:=optional, org.apache.tinkerpop.*;resolution:=optional, reactor.blockhound.*;resolution:=optional, *
</Import-Package>
<Export-Package>com.datastax.oss.driver.*.core.*, com.datastax.dse.driver.*.core.*</Export-Package>
</instructions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package com.datastax.dse.driver.api.core.auth;

import com.datastax.dse.driver.api.core.graph.GraphStatement;
import com.datastax.dse.driver.internal.core.graph.GraphSupportRemoved;
import com.datastax.oss.driver.api.core.cql.Statement;
import com.datastax.oss.driver.shaded.guava.common.base.Charsets;
import com.datastax.oss.protocol.internal.util.collection.NullAllowingImmutableMap;
Expand Down Expand Up @@ -52,16 +53,13 @@ public static <StatementT extends Statement<StatementT>> StatementT executeAs(
addProxyExecuteEntry(statement.getCustomPayload(), userOrRole));
}

/**
* Adds proxy authentication information to a graph statement.
*
* @see #executeAs(String, Statement)
*/
/** @deprecated DSE Graph is no longer supported. */
@Deprecated
@SuppressWarnings("DoNotCallSuggester")
@NonNull
public static <StatementT extends GraphStatement<StatementT>> StatementT executeAs(
@NonNull String userOrRole, @NonNull StatementT statement) {
return statement.setCustomPayload(
addProxyExecuteEntry(statement.getCustomPayload(), userOrRole));
throw GraphSupportRemoved.exception();
}

private static Map<String, ByteBuffer> addProxyExecuteEntry(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,47 +126,53 @@ public enum DseDriverOption implements DriverOption {
"advanced.metrics.session.continuous-cql-requests.refresh-interval"),

/**
* The read consistency level to use for graph statements.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value type: {@link String}
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
GRAPH_READ_CONSISTENCY_LEVEL("basic.graph.read-consistency-level"),
/**
* The write consistency level to use for graph statements.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value type: {@link String}
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
GRAPH_WRITE_CONSISTENCY_LEVEL("basic.graph.write-consistency-level"),
/**
* The traversal source to use for graph statements.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value type: {@link String}
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
GRAPH_TRAVERSAL_SOURCE("basic.graph.traversal-source"),
Comment thread
dkropachev marked this conversation as resolved.
/**
* The sub-protocol the driver will use to communicate with DSE Graph, on top of the Cassandra
* native protocol.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value type: {@link String}
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
GRAPH_SUB_PROTOCOL("advanced.graph.sub-protocol"),
/**
* Whether a script statement represents a system query.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value type: boolean
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
GRAPH_IS_SYSTEM_QUERY("basic.graph.is-system-query"),
/**
* The name of the graph targeted by graph statements.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value type: {@link String}
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
GRAPH_NAME("basic.graph.name"),
/**
* How long the driver waits for a graph request to complete.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value-type: {@link java.time.Duration Duration}
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
GRAPH_TIMEOUT("basic.graph.timeout"),

/**
Expand All @@ -177,77 +183,84 @@ public enum DseDriverOption implements DriverOption {
MONITOR_REPORTING_ENABLED("advanced.monitor-reporting.enabled"),

/**
* Whether to enable paging for Graph queries.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value type: {@link String}
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
GRAPH_PAGING_ENABLED("advanced.graph.paging-enabled"),

/**
* The page size for Graph continuous paging.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value type: int
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
GRAPH_CONTINUOUS_PAGING_PAGE_SIZE("advanced.graph.paging-options.page-size"),

/**
* The maximum number of Graph continuous pages to return.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value type: int
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
GRAPH_CONTINUOUS_PAGING_MAX_PAGES("advanced.graph.paging-options.max-pages"),
/**
* The maximum number of Graph continuous pages per second.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value type: int
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
GRAPH_CONTINUOUS_PAGING_MAX_PAGES_PER_SECOND(
"advanced.graph.paging-options.max-pages-per-second"),
/**
* The maximum number of Graph continuous pages that can be stored in the local queue.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value type: int
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
GRAPH_CONTINUOUS_PAGING_MAX_ENQUEUED_PAGES("advanced.graph.paging-options.max-enqueued-pages"),
/**
* The largest latency that we expect to record for graph requests.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value-type: {@link java.time.Duration Duration}
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
METRICS_SESSION_GRAPH_REQUESTS_HIGHEST("advanced.metrics.session.graph-requests.highest-latency"),
/**
* The number of significant decimal digits to which internal structures will maintain for graph
* requests.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value-type: int
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
METRICS_SESSION_GRAPH_REQUESTS_DIGITS(
"advanced.metrics.session.graph-requests.significant-digits"),
/**
* The interval at which percentile data is refreshed for graph requests.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value-type: {@link java.time.Duration Duration}
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
METRICS_SESSION_GRAPH_REQUESTS_INTERVAL(
"advanced.metrics.session.graph-requests.refresh-interval"),
/**
* The largest latency that we expect to record for graph requests.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value-type: {@link java.time.Duration Duration}
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
METRICS_NODE_GRAPH_MESSAGES_HIGHEST("advanced.metrics.node.graph-messages.highest-latency"),
/**
* The number of significant decimal digits to which internal structures will maintain for graph
* requests.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value-type: int
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
METRICS_NODE_GRAPH_MESSAGES_DIGITS("advanced.metrics.node.graph-messages.significant-digits"),
/**
* The interval at which percentile data is refreshed for graph requests.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value-type: {@link java.time.Duration Duration}
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
METRICS_NODE_GRAPH_MESSAGES_INTERVAL("advanced.metrics.node.graph-messages.refresh-interval"),

/**
Expand All @@ -266,48 +279,50 @@ public enum DseDriverOption implements DriverOption {
"advanced.metrics.session.continuous-cql-requests.slo"),

/**
* The shortest latency that we expect to record for graph requests.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value-type: {@link java.time.Duration Duration}
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
METRICS_SESSION_GRAPH_REQUESTS_LOWEST("advanced.metrics.session.graph-requests.lowest-latency"),
/**
* Optional service-level objectives to meet, as a list of latencies to track.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value-type: {@link java.time.Duration Duration}
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
METRICS_SESSION_GRAPH_REQUESTS_SLO("advanced.metrics.session.graph-requests.slo"),

/**
* The shortest latency that we expect to record for graph requests.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value-type: {@link java.time.Duration Duration}
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
METRICS_NODE_GRAPH_MESSAGES_LOWEST("advanced.metrics.node.graph-messages.lowest-latency"),
/**
* Optional service-level objectives to meet, as a list of latencies to track.
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value-type: {@link java.time.Duration Duration}
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
METRICS_NODE_GRAPH_MESSAGES_SLO("advanced.metrics.node.graph-messages.slo"),
/**
* Optional list of percentiles to publish for graph-requests metric. Produces an additional time
* series for each requested percentile. This percentile is computed locally, and so can't be
* aggregated with percentiles computed across other dimensions (e.g. in a different instance).
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value type: {@link java.util.List List}&#60;{@link Double}&#62;
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
METRICS_SESSION_GRAPH_REQUESTS_PUBLISH_PERCENTILES(
"advanced.metrics.session.graph-requests.publish-percentiles"),
/**
* Optional list of percentiles to publish for node graph-messages metric. Produces an additional
* time series for each requested percentile. This percentile is computed locally, and so can't be
* aggregated with percentiles computed across other dimensions (e.g. in a different instance).
* This option is ignored because DSE Graph support has been removed.
*
* <p>Value type: {@link java.util.List List}&#60;{@link Double}&#62;
* @deprecated DSE Graph is no longer supported.
*/
@Deprecated
METRICS_NODE_GRAPH_MESSAGES_PUBLISH_PERCENTILES(
"advanced.metrics.node.graph-messages.publish-percentiles"),

/**
* Optional list of percentiles to publish for continuous paging requests metric. Produces an
* additional time series for each requested percentile. This percentile is computed locally, and
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
package com.datastax.dse.driver.api.core.graph;

import com.datastax.dse.driver.internal.core.graph.GraphExecutionInfoConverter;
import com.datastax.dse.driver.internal.core.graph.GraphSupportRemoved;
import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
Expand All @@ -34,13 +34,16 @@
* concurrently).
*
* @see GraphResultSet
* @deprecated DSE Graph is not supported starting with driver 4.19.2.2.
*/
@SuppressWarnings("DoNotCallSuggester")
@Deprecated
public interface AsyncGraphResultSet {

/** The execution information for this page of results. */
@NonNull
default ExecutionInfo getRequestExecutionInfo() {
return GraphExecutionInfoConverter.convert(getExecutionInfo());
throw GraphSupportRemoved.exception();
}

/**
Expand Down
Loading
Loading