Skip to content

Commit 8037b95

Browse files
cdegroccdegroc
committed
Shade and relocate datastax/scylladb drivers
Signed-off-by: Clement de Groc <clement.degroc@datadoghq.com>
1 parent dcd3240 commit 8037b95

Some content is hidden

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

43 files changed

+443
-317
lines changed

‎cassandra-hadoop-util/pom.xml‎

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,14 @@
1818

1919
<dependencies>
2020
<dependency>
21-
<groupId>org.apache.hadoop</groupId>
22-
<artifactId>hadoop-client</artifactId>
21+
<groupId>org.janusgraph</groupId>
22+
<artifactId>janusgraph-shaded-datastax-java-driver</artifactId>
23+
<version>${project.version}</version>
2324
</dependency>
2425

2526
<dependency>
26-
<groupId>com.datastax.cassandra</groupId>
27-
<artifactId>cassandra-driver-core</artifactId>
28-
<version>3.11.3</version>
29-
<exclusions>
30-
<exclusion>
31-
<groupId>com.github.jnr</groupId>
32-
<artifactId>jnr-ffi</artifactId>
33-
</exclusion>
34-
<exclusion>
35-
<groupId>com.github.jnr</groupId>
36-
<artifactId>jnr-posix</artifactId>
37-
</exclusion>
38-
<exclusion>
39-
<groupId>io.dropwizard.metrics</groupId>
40-
<artifactId>metrics-core</artifactId>
41-
</exclusion>
42-
<exclusion>
43-
<groupId>io.netty</groupId>
44-
<artifactId>netty-handler</artifactId>
45-
</exclusion>
46-
</exclusions>
27+
<groupId>org.apache.hadoop</groupId>
28+
<artifactId>hadoop-client</artifactId>
4729
</dependency>
4830
</dependencies>
4931
</project>

‎cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/CqlClientHelper.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
package org.apache.cassandra.hadoop.cql3;
2020

21-
import com.datastax.driver.core.Host;
22-
import com.datastax.driver.core.Metadata;
23-
import com.datastax.driver.core.Token;
24-
import com.datastax.driver.core.TokenRange;
21+
import org.janusgraph.shaded.datastax.driver.core.Host;
22+
import org.janusgraph.shaded.datastax.driver.core.Metadata;
23+
import org.janusgraph.shaded.datastax.driver.core.Token;
24+
import org.janusgraph.shaded.datastax.driver.core.TokenRange;
2525

2626
import java.util.ArrayList;
2727
import java.util.Collections;

‎cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@
2020
*
2121
*/
2222

23-
import com.datastax.driver.core.AuthProvider;
24-
import com.datastax.driver.core.Cluster;
25-
import com.datastax.driver.core.HostDistance;
26-
import com.datastax.driver.core.PlainTextAuthProvider;
27-
import com.datastax.driver.core.PoolingOptions;
28-
import com.datastax.driver.core.ProtocolOptions;
29-
import com.datastax.driver.core.ProtocolVersion;
30-
import com.datastax.driver.core.QueryOptions;
31-
import com.datastax.driver.core.RemoteEndpointAwareJdkSSLOptions;
32-
import com.datastax.driver.core.SSLOptions;
33-
import com.datastax.driver.core.SocketOptions;
34-
import com.datastax.driver.core.policies.LoadBalancingPolicy;
23+
import org.janusgraph.shaded.datastax.driver.core.AuthProvider;
24+
import org.janusgraph.shaded.datastax.driver.core.Cluster;
25+
import org.janusgraph.shaded.datastax.driver.core.HostDistance;
26+
import org.janusgraph.shaded.datastax.driver.core.PlainTextAuthProvider;
27+
import org.janusgraph.shaded.datastax.driver.core.PoolingOptions;
28+
import org.janusgraph.shaded.datastax.driver.core.ProtocolOptions;
29+
import org.janusgraph.shaded.datastax.driver.core.ProtocolVersion;
30+
import org.janusgraph.shaded.datastax.driver.core.QueryOptions;
31+
import org.janusgraph.shaded.datastax.driver.core.RemoteEndpointAwareJdkSSLOptions;
32+
import org.janusgraph.shaded.datastax.driver.core.SSLOptions;
33+
import org.janusgraph.shaded.datastax.driver.core.SocketOptions;
34+
import org.janusgraph.shaded.datastax.driver.core.policies.LoadBalancingPolicy;
3535
import com.google.common.base.Optional;
3636
import org.apache.cassandra.hadoop.ConfigHelper;
3737
import org.apache.commons.lang3.StringUtils;
@@ -280,7 +280,7 @@ private static QueryOptions getReadQueryOptions(Configuration conf)
280280
Optional<Integer> fetchSize = getInputPageRowSize(conf);
281281
QueryOptions queryOptions = new QueryOptions();
282282
if (CL != null && !CL.isEmpty())
283-
queryOptions.setConsistencyLevel(com.datastax.driver.core.ConsistencyLevel.valueOf(CL));
283+
queryOptions.setConsistencyLevel(org.janusgraph.shaded.datastax.driver.core.ConsistencyLevel.valueOf(CL));
284284

285285
if (fetchSize.isPresent())
286286
queryOptions.setFetchSize(fetchSize.get());

‎cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
*/
1818
package org.apache.cassandra.hadoop.cql3;
1919

20-
import com.datastax.driver.core.Cluster;
21-
import com.datastax.driver.core.Host;
22-
import com.datastax.driver.core.Metadata;
23-
import com.datastax.driver.core.ResultSet;
24-
import com.datastax.driver.core.Row;
25-
import com.datastax.driver.core.Session;
26-
import com.datastax.driver.core.SimpleStatement;
27-
import com.datastax.driver.core.Statement;
28-
import com.datastax.driver.core.TokenRange;
29-
import com.datastax.driver.core.exceptions.InvalidQueryException;
20+
import org.janusgraph.shaded.datastax.driver.core.Cluster;
21+
import org.janusgraph.shaded.datastax.driver.core.Host;
22+
import org.janusgraph.shaded.datastax.driver.core.Metadata;
23+
import org.janusgraph.shaded.datastax.driver.core.ResultSet;
24+
import org.janusgraph.shaded.datastax.driver.core.Row;
25+
import org.janusgraph.shaded.datastax.driver.core.Session;
26+
import org.janusgraph.shaded.datastax.driver.core.SimpleStatement;
27+
import org.janusgraph.shaded.datastax.driver.core.Statement;
28+
import org.janusgraph.shaded.datastax.driver.core.TokenRange;
29+
import org.janusgraph.shaded.datastax.driver.core.exceptions.InvalidQueryException;
3030
import com.google.common.base.Preconditions;
3131
import com.google.common.collect.Iterables;
3232
import com.google.common.collect.Maps;

‎cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717
*/
1818
package org.apache.cassandra.hadoop.cql3;
1919

20-
import com.datastax.driver.core.Cluster;
21-
import com.datastax.driver.core.ColumnDefinitions;
22-
import com.datastax.driver.core.ColumnMetadata;
23-
import com.datastax.driver.core.LocalDate;
24-
import com.datastax.driver.core.Metadata;
25-
import com.datastax.driver.core.ResultSet;
26-
import com.datastax.driver.core.Row;
27-
import com.datastax.driver.core.Session;
28-
import com.datastax.driver.core.TableMetadata;
29-
import com.datastax.driver.core.Token;
30-
import com.datastax.driver.core.TupleValue;
31-
import com.datastax.driver.core.TypeCodec;
32-
import com.datastax.driver.core.UDTValue;
20+
import org.janusgraph.shaded.datastax.driver.core.Cluster;
21+
import org.janusgraph.shaded.datastax.driver.core.ColumnDefinitions;
22+
import org.janusgraph.shaded.datastax.driver.core.ColumnMetadata;
23+
import org.janusgraph.shaded.datastax.driver.core.LocalDate;
24+
import org.janusgraph.shaded.datastax.driver.core.Metadata;
25+
import org.janusgraph.shaded.datastax.driver.core.ResultSet;
26+
import org.janusgraph.shaded.datastax.driver.core.Row;
27+
import org.janusgraph.shaded.datastax.driver.core.Session;
28+
import org.janusgraph.shaded.datastax.driver.core.TableMetadata;
29+
import org.janusgraph.shaded.datastax.driver.core.Token;
30+
import org.janusgraph.shaded.datastax.driver.core.TupleValue;
31+
import org.janusgraph.shaded.datastax.driver.core.TypeCodec;
32+
import org.janusgraph.shaded.datastax.driver.core.UDTValue;
3333
import com.google.common.base.Function;
3434
import com.google.common.base.Joiner;
3535
import com.google.common.base.Splitter;

‎cassandra-hadoop-util/src/main/java/org/apache/cassandra/hadoop/cql3/LimitedLocalNodeFirstLocalBalancingPolicy.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
*/
1818
package org.apache.cassandra.hadoop.cql3;
1919

20-
import com.datastax.driver.core.Cluster;
21-
import com.datastax.driver.core.Host;
22-
import com.datastax.driver.core.HostDistance;
23-
import com.datastax.driver.core.Statement;
24-
import com.datastax.driver.core.policies.LoadBalancingPolicy;
20+
import org.janusgraph.shaded.datastax.driver.core.Cluster;
21+
import org.janusgraph.shaded.datastax.driver.core.Host;
22+
import org.janusgraph.shaded.datastax.driver.core.HostDistance;
23+
import org.janusgraph.shaded.datastax.driver.core.Statement;
24+
import org.janusgraph.shaded.datastax.driver.core.policies.LoadBalancingPolicy;
2525
import com.google.common.base.Function;
2626
import com.google.common.collect.Iterators;
2727
import com.google.common.collect.Sets;

‎docs/configs/janusgraph-cfg.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ Configuration options for CQL request tracker and builtin request logger
504504

505505
| Name | Description | Datatype | Default Value | Mutability |
506506
| ---- | ---- | ---- | ---- | ---- |
507-
| storage.cql.request-tracker.class | It is either a predefined DataStax driver value for a builtin request tracker or a full qualified class name which implements `com.datastax.oss.driver.internal.core.tracker.RequestTracker` interface. If no any value provided, the default DataStax request tracker is used, which is `NoopRequestTracker` which doesn't do anything. If `RequestLogger` value is provided, the DataStax [RequestLogger](https://docs.datastax.com/en/developer/java-driver/4.9/manual/core/request_tracker/#request-logger) is used. | String | (no default value) | LOCAL |
507+
| storage.cql.request-tracker.class | It is either a predefined DataStax driver value for a builtin request tracker or a full qualified class name which implements `org.janusgraph.shaded.datastax.oss.driver.internal.core.tracker.RequestTracker` interface. If no any value provided, the default DataStax request tracker is used, which is `NoopRequestTracker` which doesn't do anything. If `RequestLogger` value is provided, the DataStax [RequestLogger](https://docs.datastax.com/en/developer/java-driver/4.9/manual/core/request_tracker/#request-logger) is used. | String | (no default value) | LOCAL |
508508
| storage.cql.request-tracker.logs-error-enabled | Whether to log failed requests.Can be used when `root.storage.cql.request-tracker.class` is set to `RequestLogger`. | Boolean | (no default value) | LOCAL |
509509
| storage.cql.request-tracker.logs-max-query-length | The maximum length of the query string in the log message. Can be used when `root.storage.cql.request-tracker.class` is set to `RequestLogger`. | Integer | (no default value) | LOCAL |
510510
| storage.cql.request-tracker.logs-max-value-length | The maximum length for bound values in the log message. Can be used when `root.storage.cql.request-tracker.class` is set to `RequestLogger`. | Integer | (no default value) | LOCAL |

‎janusgraph-cql/pom.xml‎

Lines changed: 3 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -74,58 +74,9 @@
7474
</dependency>
7575

7676
<dependency>
77-
<groupId>com.datastax.oss</groupId>
78-
<artifactId>java-driver-core</artifactId>
79-
<version>${cassandra-driver.version}</version>
80-
<exclusions>
81-
<exclusion>
82-
<groupId>org.json</groupId>
83-
<artifactId>json</artifactId>
84-
</exclusion>
85-
<exclusion>
86-
<groupId>com.esri.geometry</groupId>
87-
<artifactId>esri-geometry-api</artifactId>
88-
</exclusion>
89-
<exclusion>
90-
<groupId>org.apache.tinkerpop</groupId>
91-
<artifactId>gremlin-core</artifactId>
92-
</exclusion>
93-
<exclusion>
94-
<groupId>org.apache.tinkerpop</groupId>
95-
<artifactId>tinkergraph-gremlin</artifactId>
96-
</exclusion>
97-
<exclusion>
98-
<groupId>io.netty</groupId>
99-
<artifactId>netty-handler</artifactId>
100-
</exclusion>
101-
<exclusion>
102-
<groupId>org.ow2.asm</groupId>
103-
<artifactId>asm-commons</artifactId>
104-
</exclusion>
105-
</exclusions>
106-
</dependency>
107-
<dependency>
108-
<groupId>com.datastax.oss</groupId>
109-
<artifactId>java-driver-query-builder</artifactId>
110-
<version>${cassandra-driver.version}</version>
111-
<exclusions>
112-
<exclusion>
113-
<groupId>org.json</groupId>
114-
<artifactId>json</artifactId>
115-
</exclusion>
116-
<exclusion>
117-
<groupId>org.apache.tinkerpop</groupId>
118-
<artifactId>gremlin-core</artifactId>
119-
</exclusion>
120-
<exclusion>
121-
<groupId>org.apache.tinkerpop</groupId>
122-
<artifactId>tinkergraph-gremlin</artifactId>
123-
</exclusion>
124-
<exclusion>
125-
<groupId>io.netty</groupId>
126-
<artifactId>netty-handler</artifactId>
127-
</exclusion>
128-
</exclusions>
77+
<groupId>org.janusgraph</groupId>
78+
<artifactId>janusgraph-shaded-datastax-java-driver</artifactId>
79+
<version>${project.version}</version>
12980
</dependency>
13081
<dependency>
13182
<groupId>io.vavr</groupId>

‎janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLColValGetter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package org.janusgraph.diskstorage.cql;
1616

17-
import com.datastax.oss.driver.api.core.cql.Row;
17+
import org.janusgraph.shaded.datastax.oss.driver.api.core.cql.Row;
1818
import io.vavr.Tuple3;
1919
import org.janusgraph.diskstorage.EntryMetaData;
2020
import org.janusgraph.diskstorage.StaticBuffer;

‎janusgraph-cql/src/main/java/org/janusgraph/diskstorage/cql/CQLConfigOptions.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package org.janusgraph.diskstorage.cql;
1616

17-
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
17+
import org.janusgraph.shaded.datastax.oss.driver.api.core.config.DefaultDriverOption;
1818
import org.janusgraph.diskstorage.configuration.ConfigElement;
1919
import org.janusgraph.diskstorage.configuration.ConfigNamespace;
2020
import org.janusgraph.diskstorage.configuration.ConfigOption;
@@ -518,7 +518,7 @@ public interface CQLConfigOptions {
518518
"class",
519519
"It is either a predefined DataStax driver value for a builtin request tracker " +
520520
"or a full qualified class name which implements " +
521-
"`com.datastax.oss.driver.internal.core.tracker.RequestTracker` interface. " +
521+
"`org.janusgraph.shaded.datastax.oss.driver.internal.core.tracker.RequestTracker` interface. " +
522522
"If no any value provided, the default DataStax request tracker is used, which is `NoopRequestTracker` " +
523523
"which doesn't do anything. If `RequestLogger` value is provided, the DataStax [RequestLogger]" +
524524
"(https://docs.datastax.com/en/developer/java-driver/4.9/manual/core/request_tracker/#request-logger) " +

0 commit comments

Comments
 (0)