feat(cassandra): Enable case-sensitive support #25690

bibith4 · 2025-08-05T10:29:12Z

Description

Enable case sensitivity support in Cassandra connector

Motivation and Context

Cassandra connector always treated table and column names as lowercase. With this change, the connector can preserve case sensitivity, allowing the creation of tables and columns with the same name but different casing, depending on the configuration setting.

Impact

Supports creating tables and columns with the same name in different cases

Test Plan

Contributor checklist

Please make sure your submission complies with our contributing guide, in particular code style and commit standards.
PR description addresses the issue accurately and concisely. If the change is non-trivial, a GitHub Issue is referenced.
Documented new properties (with its default value), SQL syntax, functions, or other functionality.
If release notes are required, they follow the release notes guidelines.
Adequate tests were added if applicable.
CI passed.

Release Notes

Please follow release notes guidelines and fill in the release notes below.

== RELEASE NOTES ==

Cassandra Connector Changes
* Add support for case-sensitive identifiers in Cassandra. It can be enabled by setting ``case-sensitive-name-matching=true`` configuration in the catalog configuration

agrawalreetika

Thanks for making the changes and adding the support.
I think currently, schemas are still getting converted to lowercase? https://github.com/bibith4/presto/blob/73ec9cd4a49982120eb3af5e781a943baf755205/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraMetadata.java#L101

Please verify and make the changes along with the tests accordingly.

bibith4 · 2025-08-13T10:09:53Z

Thanks for making the changes and adding the support. I think currently, schemas are still getting converted to lowercase? https://github.com/bibith4/presto/blob/73ec9cd4a49982120eb3af5e781a943baf755205/presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraMetadata.java#L101

Please verify and make the changes along with the tests accordingly.

@agrawalreetika Added the requested changes. Please check

agrawalreetika · 2025-08-13T10:15:08Z

...assandra/src/test/java/com/facebook/presto/cassandra/TestCassandraIntergrationMixedCase.java

+        session.execute("CREATE KEYSPACE test_keyspace WITH REPLICATION = {'class':'SimpleStrategy', 'replication_factor': 1}");
+        assertContainsEventually(() -> getQueryRunner().execute("SHOW SCHEMAS FROM cassandra"), resultBuilder(getSession(), createUnboundedVarcharType())
+                .row("test_keyspace")
+                .build(), new Duration(1, MINUTES));


Lets add schema creation for same KEYSPACE in upper case as well and then check for lowercase and upper cae for in testShowSchemas

Please add the documenation details as well for new config - https://prestodb.io/docs/current/connector/cassandra.html#configuration-properties

Please add the documenation details as well for new config - https://prestodb.io/docs/current/connector/cassandra.html#configuration-properties

Yes, please add documentation. You can use the MySQL doc as a model where the case-sensitive-name-matching property is documented in the last row of the table.

@agrawalreetika @steveburnett updated the document with new config property. Please check

Lets add schema creation for same KEYSPACE in upper case as well and then check for lowercase and upper cae for in testShowSchemas

@agrawalreetika Added the required changes. Please check

steveburnett

Thanks for the docs! Minor nits.

presto-docs/src/main/sphinx/connector/cassandra.rst

steveburnett

LGTM! (docs)

Pull updated branch, new local doc build, looks good. Thanks!

imjalpreet

@bibith4, some changes appear to be in the wrong commit. Please check and update the commits to include only relevant changes. It would really help in the review process. Thank you!

bibith4 · 2025-09-11T15:03:23Z

@bibith4, some changes appear to be in the wrong commit. Please check and update the commits to include only relevant changes. It would really help in the review process. Thank you!

@imjalpreet As discussed created a seperate PR for Enable and fix all Cassandra connector tests in CI(#26022 (comment)).

bibith4 · 2025-09-18T07:29:00Z

@imjalpreet Updated the PR to include only mixed-case support for the Cassandra change. Can you please take a look.

agrawalreetika · 2025-09-18T16:25:18Z

...assandra/src/test/java/com/facebook/presto/cassandra/TestCassandraIntergrationMixedCase.java

+            session.execute("DROP KEYSPACE keyspace_1");
+        }
+    }
+}


@bibith4 Can you add a test method for ALTER operations as well?

@agrawalreetika Cassandra does not support ALTER operations

imjalpreet

Thanks, @bibith4.

imjalpreet · 2025-09-18T22:03:59Z

presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraMetadata.java

            try {
                for (String tableName : cassandraSession.getCaseSensitiveTableNames(schemaName)) {
-                    tableNames.add(new SchemaTableName(schemaName, tableName.toLowerCase(ENGLISH)));
+                    String finalTableName = normalizeIdentifier(session, tableName);


nit:

Suggested change

String finalTableName = normalizeIdentifier(session, tableName);

String normalizedTableName = normalizeIdentifier(session, tableName);

@imjalpreet Changed as per suggestion. Please check

imjalpreet · 2025-09-18T22:04:35Z

presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraMetadata.java

        for (CassandraColumnHandle columnHandle : table.getColumns()) {
-            columnHandles.put(CassandraCqlUtils.cqlNameToSqlName(columnHandle.getName()).toLowerCase(ENGLISH), columnHandle);
+            String columnName = CassandraCqlUtils.cqlNameToSqlName(columnHandle.getName());
+            String finalColumnName = normalizeIdentifier(session, columnName);


Suggested change

String finalColumnName = normalizeIdentifier(session, columnName);

String normalizedColumnName = normalizeIdentifier(session, columnName);

@imjalpreet Changed as per suggestion. Please check

imjalpreet · 2025-09-18T22:35:05Z

presto-cassandra/src/main/java/com/facebook/presto/cassandra/CassandraMetadata.java

        ImmutableMap.Builder<String, ColumnHandle> columnHandles = ImmutableMap.builder();
        for (CassandraColumnHandle columnHandle : table.getColumns()) {
-            columnHandles.put(CassandraCqlUtils.cqlNameToSqlName(columnHandle.getName()).toLowerCase(ENGLISH), columnHandle);
+            String columnName = CassandraCqlUtils.cqlNameToSqlName(columnHandle.getName());


nit: static import for cqlNameToSqlName

@imjalpreet Changed as per suggestion. Please check

imjalpreet · 2025-09-18T22:49:37Z

presto-cassandra/src/main/java/com/facebook/presto/cassandra/NativeCassandraSession.java

                if (result != null) {
                    throw new PrestoException(
                            NOT_SUPPORTED,
-                            format("More than one keyspace has been found for the case insensitive schema name: %s -> (%s, %s)",
-                                    caseInsensitiveSchemaName, result.getName(), keyspace.getName()));
+                            format("More than one keyspace has been found for the schema name: %s -> (%s, %s)",
+                                    caseSensitiveSchemaName, result.getName(), keyspace.getName()));
                }


Do we need this check when caseSensitiveNameMatchingEnabled is true? I think it can only happen if we match case-insensitively.

@imjalpreet Changed to check only if caseSensitiveNameMatchingEnabled is false

imjalpreet · 2025-09-18T22:56:39Z

presto-cassandra/src/main/java/com/facebook/presto/cassandra/NativeCassandraSession.java

                keyspace.getTables().stream(),
                keyspace.getMaterializedViews().stream())
-                .filter(table -> table.getName().equalsIgnoreCase(caseInsensitiveTableName))
+                .filter(table -> caseSensitiveNameMatchingEnabled ? table.getName().equals(caseSensitiveTableName) : table.getName().equalsIgnoreCase(caseSensitiveTableName))


nit: maybe we can make the matchesSchemaName method generic and use it for both table and schema checks.

@imjalpreet Changed to make the method generic

imjalpreet · 2025-09-18T22:58:05Z

presto-cassandra/src/main/java/com/facebook/presto/cassandra/NativeCassandraSession.java

+            if (columnMap.containsKey(columnNameKey)) {
                throw new PrestoException(
                        NOT_SUPPORTED,
                        format("More than one column has been found for the case insensitive column name: %s -> (%s, %s)",
-                                lowercaseName, lowercaseNameToColumnMap.get(lowercaseName).getName(), column.getName()));
+                                columnNameKey, columnMap.get(columnNameKey).getName(), column.getName()));


Same question here. Do we need this when caseSensitiveNameMatchingEnabled is true?

@imjalpreet Changed to check only if caseSensitiveNameMatchingEnabled is false

imjalpreet · 2025-09-18T23:01:07Z

...assandra/src/test/java/com/facebook/presto/cassandra/TestCassandraIntergrationMixedCase.java

+{
+    private CassandraServer server;
+    private CassandraSession session;
+    private static final String KEYSPACE = "test_connetor";


Suggested change

private static final String KEYSPACE = "test_connetor";

private static final String KEYSPACE = "test_connector";

@imjalpreet Corrected. Please check

imjalpreet · 2025-09-18T23:07:07Z

...assandra/src/test/java/com/facebook/presto/cassandra/TestCassandraIntergrationMixedCase.java

+            assertQueryFails("CREATE TABLE test_connector.TEST_CREATEAS_FAIL_Join AS SELECT c.custkey, o.orderkey FROM " +
+                        "tpch.customer c INNER JOIN tpch.ORDERS1 o ON c.custkey = o.custkey WHERE c.mktsegment = 'BUILDING'", "Table cassandra.tpch.ORDERS1 does not exist"); //failure scenario since tpch.ORDERS1 doesn't exist


What is the significance of this test? Shouldn't we test with just ORDERS rather than ORDERS1 as lowercase orders exists?

@imjalpreet Corrected to use ORDERS. Please check

imjalpreet · 2025-09-18T23:08:43Z

...assandra/src/test/java/com/facebook/presto/cassandra/TestCassandraIntergrationMixedCase.java

+                        "tpch.customer Cus INNER JOIN tpch.orders Ord ON Cus.custkey = Ord.custkey WHERE Cus.mktsegment = 'BUILDING'");
+            assertTrue(getQueryRunner().tableExists(session, "Test_CreateAs_Mixed_Join"));
+        }
+        finally {


nit: you missed dropping TEST_CREATEAS_Join

@imjalpreet added drop statement for TEST_CREATEAS_Join

imjalpreet · 2025-09-18T23:10:47Z

...assandra/src/test/java/com/facebook/presto/cassandra/TestCassandraIntergrationMixedCase.java

+            assertQuery("SELECT COUNT(*) FROM test_connetor.test_select", "VALUES 2");
+        }
+        finally {
+            getQueryRunner().execute(session, "DROP TABLE IF EXISTS TEST_SELECT");


We created lowercase TEST_SELECT

@imjalpreet Corrected. Please check

imjalpreet

Thank you, @bibith4.

Changes LGTM now, last few nits.

imjalpreet · 2025-09-19T12:49:17Z

presto-cassandra/src/main/java/com/facebook/presto/cassandra/NativeCassandraSession.java

-                            format("More than one keyspace has been found for the case insensitive schema name: %s -> (%s, %s)",
-                                    caseInsensitiveSchemaName, result.getName(), keyspace.getName()));
+                            format("More than one keyspace has been found for the schema name: %s -> (%s, %s)",
+                                    caseSensitiveSchemaName, result.getName(), keyspace.getName()));


nit: I think we should print the lowercased schema name in the error message

@imjalpreet Corrected. Please check

imjalpreet · 2025-09-19T12:53:57Z

presto-cassandra/src/main/java/com/facebook/presto/cassandra/NativeCassandraSession.java

                format("More than one table has been found for the case insensitive table name: %s -> (%s)",
-                        caseInsensitiveTableName, tableNames));
+                        caseSensitiveTableName, tableNames));
    }


~~Missed this the last time, similar to schema and column names, this is also only needed when caseSensitiveNameMatchingEnabled is false~~

Sorry, ignore this. Its already handled.

But print the lowercased table name in error message

@imjalpreet Corrected. Please check

imjalpreet · 2025-09-19T12:54:58Z

presto-cassandra/src/main/java/com/facebook/presto/cassandra/NativeCassandraSession.java

    private static void checkColumnNames(List<ColumnMetadata> columns)
    {
-        Map<String, ColumnMetadata> lowercaseNameToColumnMap = new HashMap<>();
+        Map<String, ColumnMetadata> columnMap = new HashMap<>();


nit: maybe this line change can now be reverted

@imjalpreet Corrected. Please check

imjalpreet

Thank you, @bibith4.

LGTM.

tdcmeehan · 2025-10-08T14:18:31Z

presto-cassandra/src/test/java/com/facebook/presto/cassandra/CassandraQueryRunner.java

+        connectorProperties = new HashMap<>(ImmutableMap.copyOf(connectorProperties));
+        connectorProperties.putIfAbsent("cassandra.contact-points", server.getHost());
+        connectorProperties.putIfAbsent("cassandra.native-protocol-port", Integer.toString(server.getPort()));
+        connectorProperties.putIfAbsent("cassandra.allow-drop-table", "true");
+


Are these related to the case sensitivity changes?

These were already being used. The change is to add them to the newly introduced connectorProperties map.

## Description Enable case sensitivity support in Cassandra connector ## Motivation and Context Cassandra connector always treated table and column names as lowercase. With this change, the connector can preserve case sensitivity, allowing the creation of tables and columns with the same name but different casing, depending on the configuration setting. ## Impact Supports creating tables and columns with the same name in different cases

prestodb-ci added the from:IBM PR from IBM label Aug 5, 2025

agrawalreetika changed the title ~~[Do not review]Mixed case support for cassandra~~ [Do not review] Case-sensitive support for cassandra Aug 6, 2025

bibith4 force-pushed the mixedcase_cassandra branch 5 times, most recently from 44c3dcc to 73ec9cd Compare August 11, 2025 15:46

bibith4 marked this pull request as ready for review August 12, 2025 07:10

bibith4 requested a review from a team as a code owner August 12, 2025 07:10

prestodb-ci requested review from a team, BryanCutler and ScrapCodes and removed request for a team August 12, 2025 07:10

bibith4 requested a review from agrawalreetika August 12, 2025 07:10

bibith4 changed the title ~~[Do not review] Case-sensitive support for cassandra~~ Case-sensitive support for cassandra Aug 12, 2025

agrawalreetika requested changes Aug 12, 2025

View reviewed changes

bibith4 force-pushed the mixedcase_cassandra branch 3 times, most recently from 5dd62cf to c81c097 Compare August 13, 2025 10:08

bibith4 requested a review from agrawalreetika August 13, 2025 10:09

agrawalreetika reviewed Aug 13, 2025

View reviewed changes

bibith4 force-pushed the mixedcase_cassandra branch from c81c097 to 6b547ef Compare August 18, 2025 11:22

bibith4 requested a review from elharo as a code owner August 18, 2025 11:22

bibith4 requested review from agrawalreetika and steveburnett August 18, 2025 11:32

steveburnett requested changes Aug 18, 2025

View reviewed changes

presto-docs/src/main/sphinx/connector/cassandra.rst Outdated Show resolved Hide resolved

presto-docs/src/main/sphinx/connector/cassandra.rst Outdated Show resolved Hide resolved

bibith4 force-pushed the mixedcase_cassandra branch from 6b547ef to 58971f4 Compare August 18, 2025 15:10

bibith4 requested a review from steveburnett August 18, 2025 15:12

steveburnett previously approved these changes Aug 18, 2025

View reviewed changes

imjalpreet reviewed Sep 10, 2025

View reviewed changes

bibith4 force-pushed the mixedcase_cassandra branch 3 times, most recently from aa7e9d7 to a1fbb34 Compare September 18, 2025 06:43

bibith4 requested a review from imjalpreet September 18, 2025 07:29

agrawalreetika requested changes Sep 18, 2025

View reviewed changes

imjalpreet requested changes Sep 18, 2025

View reviewed changes

bibith4 force-pushed the mixedcase_cassandra branch from a1fbb34 to 6dfb570 Compare September 19, 2025 10:34

bibith4 requested a review from imjalpreet September 19, 2025 10:39

imjalpreet reviewed Sep 19, 2025

View reviewed changes

bibith4 force-pushed the mixedcase_cassandra branch 2 times, most recently from 5cbeef3 to 2aa6330 Compare September 22, 2025 06:44

bibith4 requested a review from imjalpreet September 22, 2025 06:50

bibith4 changed the title ~~Case-sensitive support for cassandra~~ feat(cassandra): Enable case-sensitive support Oct 3, 2025

bibith4 force-pushed the mixedcase_cassandra branch from 2aa6330 to d3cb81e Compare October 3, 2025 05:47

Enable case-senstive identifer support for Cassandra connector

22b61df

bibith4 force-pushed the mixedcase_cassandra branch from d3cb81e to 22b61df Compare October 6, 2025 05:09

imjalpreet approved these changes Oct 8, 2025

View reviewed changes

imjalpreet requested a review from tdcmeehan October 8, 2025 10:06

tdcmeehan reviewed Oct 8, 2025

View reviewed changes

tdcmeehan approved these changes Oct 8, 2025

View reviewed changes

agrawalreetika approved these changes Oct 8, 2025

View reviewed changes

BryanCutler approved these changes Oct 8, 2025

View reviewed changes

imjalpreet merged commit 75a4ff9 into prestodb:master Oct 8, 2025
113 of 117 checks passed

unidevel mentioned this pull request Nov 14, 2025

Add release notes for 0.296 unix280/presto#47

Merged

15 tasks

This was referenced Nov 24, 2025

Add release notes for 0.296 unix280/presto#48

Merged

Add release notes for 0.296 unix280/presto#49

Merged

	String finalTableName = normalizeIdentifier(session, tableName);
	String normalizedTableName = normalizeIdentifier(session, tableName);

	String finalColumnName = normalizeIdentifier(session, columnName);
	String normalizedColumnName = normalizeIdentifier(session, columnName);

	private static final String KEYSPACE = "test_connetor";
	private static final String KEYSPACE = "test_connector";

		assertQueryFails("CREATE TABLE test_connector.TEST_CREATEAS_FAIL_Join AS SELECT c.custkey, o.orderkey FROM " +
		"tpch.customer c INNER JOIN tpch.ORDERS1 o ON c.custkey = o.custkey WHERE c.mktsegment = 'BUILDING'", "Table cassandra.tpch.ORDERS1 does not exist"); //failure scenario since tpch.ORDERS1 doesn't exist

feat(cassandra): Enable case-sensitive support #25690

feat(cassandra): Enable case-sensitive support #25690

Uh oh!

Conversation

bibith4 commented Aug 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Motivation and Context

Impact

Test Plan

Contributor checklist

Release Notes

Uh oh!

agrawalreetika left a comment

Choose a reason for hiding this comment

Uh oh!

bibith4 commented Aug 13, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

steveburnett left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

steveburnett left a comment

Choose a reason for hiding this comment

Uh oh!

imjalpreet left a comment

Choose a reason for hiding this comment

Uh oh!

bibith4 commented Sep 11, 2025

Uh oh!

bibith4 commented Sep 18, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

imjalpreet left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bibith4 commented Aug 5, 2025 •

edited

Loading

imjalpreet Sep 19, 2025 •

edited

Loading