Skip to content

CNDB-12683 validate table name length for not-internal #1623

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
merged 6 commits into from
Mar 12, 2025
Merged

CNDB-12683 validate table name length for not-internal #1623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b9ad8c0
CNDB-12683 try to validate table name length for not-internal
k-rus Mar 7, 2025
d8b10aa
CNDB-12683 test table name length validation for new table
k-rus Mar 11, 2025
c43325a
Fix test of failing new long name table creation
k-rus Mar 11, 2025
151a40c
Break long table name creation for any table
k-rus Mar 11, 2025
9123c19
Revert and validate only on new tables
k-rus Mar 11, 2025
0d71dde
CNDB-12683 simplify the length check and cleanup
k-rus Mar 12, 2025
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
4 changes: 4 additions & 0 deletions src/java/org/apache/cassandra/cql3/statements/schema/CreateTableStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ public void validate(QueryState state)
{
super.validate(state);

if (!state.getClientState().isInternal && tableName.length() > SchemaConstants.NAME_LENGTH - keyspaceName.length())
throw ire("Keyspace and table names combined shouldn't be more than %s characters long (got keyspace of %s chars and table of %s chars for %s.%s)",
SchemaConstants.NAME_LENGTH, keyspaceName.length(), tableName.length(), keyspaceName, tableName);

// Some tools use CreateTableStatement, and the guardrails below both don't make too much sense for tools and
// require the server to be initialized, so skipping them if it isn't.
if (Guardrails.ready())
Expand Down
16 changes: 15 additions & 1 deletion test/unit/org/apache/cassandra/schema/CreateTableValidationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package org.apache.cassandra.schema;

import com.datastax.driver.core.exceptions.InvalidQueryException;
import org.apache.cassandra.cql3.CQLTester;
import org.apache.cassandra.cql3.UntypedResultSet;
import org.apache.cassandra.cql3.functions.types.ParseUtils;
Expand Down Expand Up @@ -104,7 +105,20 @@ public void testCreateTableWithMissingClusteringColumn()
}

@Test
public void testCreatingTableWithLongName() throws Throwable
public void failCreatingNewTableWithLongName()
{
String table = "test_create_k8yq1r75bpzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz";
assertThatExceptionOfType(InvalidQueryException.class)
.isThrownBy(() -> executeNet(String.format("CREATE TABLE \"%s\".%s (" +
"key int PRIMARY KEY," +
"val int)",
KEYSPACE, table)))
.withMessageContaining(String.format("Keyspace and table names combined shouldn't be more than %s characters long (got keyspace of %s chars and table of %s chars for %s.%s)",
SchemaConstants.NAME_LENGTH, KEYSPACE.length(), table.length(), KEYSPACE, table));
}

@Test
public void testCreatingInternalTableWithLongName() throws Throwable
{
String keyspace = "\"38373639353166362d356631322d343864652d393063362d653862616534343165333764_tpch\"";
String table = "test_create_k8yq1r75bpzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz";
Expand Down