mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/scylla-sstable: create_table_in_cql_env(): register UDTs recursively

Browse Source 
It is not enough to go over all column types and register the UDTs. UDTs
might be nested in other types, like collections. One has to do a
traversal of the type tree and register every UDT on the way. That is
what this patch does.
This function is used by the query and write operations, which should
now both work with nested UDTs.

Add a test which fails before and passes after this patch.
This commit is contained in:
Botond Dénes
2026-02-25 08:34:20 +02:00
parent cf39a5e610
commit 8dbcd8a0b3
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/cqlpy/test_tools.py
View File

@@ -1826,11 +1826,26 @@ textwrap.dedent("""
None,
)
scylla_sstable_query_nested_udt = scylla_sstable_query_simple_table_param(
textwrap.dedent("""
CREATE TABLE {}.{} (
pk int PRIMARY KEY,
col_nested_udt list<frozen<my_type>>
) WITH
compaction = {{'class': 'NullCompactionStrategy'}};
"""),
"INSERT INTO {}.{} (pk, col_nested_udt) VALUES (?, ?)",
(0, [my_udt(10, 'aasdad')]),
"CREATE TYPE {}.my_type (field_1 int, field_2 text)",
"DROP TYPE {}.my_type",
)
@pytest.mark.parametrize("test_keyspace", ["tablets", "vnodes"], indirect=True)
@pytest.mark.parametrize("test_table", [
scylla_sstable_query_simple_all_types_param,
scylla_sstable_query_simple_collection_types_param,
scylla_sstable_query_simple_counter_param,
scylla_sstable_query_nested_udt,
])
def test_scylla_sstable_query_data_types(request, cql, test_keyspace, test_table, scylla_path, scylla_data_dir, temp_workdir):
"""Check read-all queries with all data-types.

6
tools/scylla-sstable.cc
View File

@@ -1651,9 +1651,9 @@ future<replica::table&> create_table_in_cql_env(cql_test_env& env, schema_ptr ss
builder.with_column(col.name(), col.type, col_kind, col.view_virtual());
// Register any user types, so they are known by the time we create the table.
if (col.type->is_user_type()) {
keyspace.add_user_type(dynamic_pointer_cast<const user_type_impl>(col.type));
}
invoke_on_user_type(col.type, [&keyspace] (const user_type_impl& udt) {
keyspace.add_user_type(dynamic_pointer_cast<const user_type_impl>(udt.shared_from_this()));
});
}
}
auto schema = builder.build();