Skip to content

SSL enablement for Cassandra Connector #23507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tdcmeehan merged 1 commit into from
Sep 5, 2024
Merged

SSL enablement for Cassandra Connector #23507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 6 additions & 12 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2126,18 +2126,6 @@
</exclusions>
</dependency>

<dependency>
<groupId>com.facebook.presto.cassandra</groupId>
<artifactId>cassandra-driver</artifactId>
<version>3.6.0-1</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-delta</artifactId>
Expand Down Expand Up @@ -2277,6 +2265,12 @@
<artifactId>commons-compress</artifactId>
<version>${dep.commons.compress.version}</version>
</dependency>

<dependency>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
<version>3.11.5</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
15 changes: 13 additions & 2 deletions presto-cassandra/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

<dependencies>
<dependency>
<groupId>com.facebook.presto.cassandra</groupId>
<artifactId>cassandra-driver</artifactId>
<groupId>com.datastax.cassandra</groupId>
Copy link
Copy Markdown
Contributor

@tdcmeehan tdcmeehan Aug 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you put this in the dependency management section of the parent pom?

Copy link
Copy Markdown
Contributor Author

@lithinwxd lithinwxd Aug 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

<artifactId>cassandra-driver-core</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -185,6 +185,17 @@
</dependency>
</dependencies>

<dependencyManagement>
Copy link
Copy Markdown
Contributor

@tdcmeehan tdcmeehan Aug 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a comment explaining why this is needed?

Copy link
Copy Markdown
Contributor Author

@lithinwxd lithinwxd Aug 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is to fix the upper bound issues arising out of different components

Copy link
Copy Markdown
Contributor

@tdcmeehan tdcmeehan Aug 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you leave a comment in the code to that effect?

Copy link
Copy Markdown
Contributor Author

@lithinwxd lithinwxd Aug 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah sure

Copy link
Copy Markdown
Contributor Author

@lithinwxd lithinwxd Aug 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added the comment

<!-- This is to fix the upper bound issues arising out of different components-->
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.107.Final</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
Expand Down
2 changes: 1 addition & 1 deletion presto-cassandra/src/test/java/com/datastax/driver/core/TestHost.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ public class TestHost
{
public TestHost(InetSocketAddress address)
{
super(address, new ConvictionPolicy.DefaultConvictionPolicy.Factory(), Cluster.builder().addContactPoints("localhost").build().manager);
super(new TranslatedAddressEndPoint(address), new ConvictionPolicy.DefaultConvictionPolicy.Factory(), Cluster.builder().addContactPoints("localhost").build().manager);
}
}
4 changes: 4 additions & 0 deletions ...sandra/src/test/java/com/facebook/presto/cassandra/TestCassandraIntegrationSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ public void testKeyspaceNameAmbiguity()

@Test
public void testTableNameAmbiguity()
throws Exception
{
session.execute("CREATE KEYSPACE keyspace_4 WITH REPLICATION = {'class':'SimpleStrategy', 'replication_factor': 1}");
assertContainsEventually(() -> execute("SHOW SCHEMAS FROM cassandra"), resultBuilder(getSession(), createUnboundedVarcharType())
Expand All @@ -355,6 +356,9 @@ public void testTableNameAmbiguity()
session.execute("CREATE TABLE keyspace_4.\"TaBlE_4\" (column_4 bigint PRIMARY KEY)");
session.execute("CREATE TABLE keyspace_4.\"tAbLe_4\" (column_4 bigint PRIMARY KEY)");

// This is added for Cassandra to refresh its metadata so that we don't encounter a race condition in the forthcoming steps and achieve eventual consistency.
Thread.sleep(1000);

// Although in Presto all the schema and table names are always displayed as lowercase
assertContainsEventually(() -> execute("SHOW TABLES FROM cassandra.keyspace_4"), resultBuilder(getSession(), createUnboundedVarcharType())
.row("table_4")
Expand Down
11 changes: 9 additions & 2 deletions presto-product-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,15 @@
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.facebook.presto.cassandra</groupId>
<artifactId>cassandra-driver</artifactId>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
<version>3.11.5</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
Expand Down