mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-12 19:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Simplify db::cql_type_parser::parse"

Browse Source 
This reverts commit 7f64a6ec4b.

Fixes #5011

The reverted commit exposes #3760 for all schemas, not only those
which have UDTs.

The problem is that table schema deserialization now requires keyspace
to be present. If the replica hasn't received schema changes which
introduce the keyspace yet, the write will fail.
This commit is contained in:
Tomasz Grabiec
2019-09-12 11:57:19 +02:00
parent 67a07e9cbc
commit 8517eecc28
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
db/cql_type_parser.cc
View File

@@ -57,9 +57,30 @@ static ::shared_ptr<cql3::cql3_type::raw> parse_raw(const sstring& str) {
}
data_type db::cql_type_parser::parse(const sstring& keyspace, const sstring& str, lw_shared_ptr<user_types_metadata> user_types) {
static const thread_local std::unordered_map<sstring, cql3::cql3_type> native_types = []{
std::unordered_map<sstring, cql3::cql3_type> res;
for (auto& nt : cql3::cql3_type::values()) {
res.emplace(nt.to_string(), nt);
}
return res;
}();
auto i = native_types.find(str);
if (i != native_types.end()) {
return i->second.get_type();
}
if (!user_types && service::get_storage_proxy().local_is_initialized()) {
user_types = service::get_storage_proxy().local().get_db().local().find_keyspace(keyspace).metadata()->user_types();
}
// special-case top-level UDTs
if (user_types) {
auto& map = user_types->get_all_types();
auto i = map.find(utf8_type->decompose(str));
if (i != map.end()) {
return i->second;
}
}
auto raw = parse_raw(str);
auto cql = raw->prepare_internal(keyspace, user_types);