bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

idl-compiler: Support optional fields in views

Browse Source 
When generating view code, the compiler was ignoring optional fields.

Signed-off-by: Duarte Nunes <duarte@scylladb.com>
This commit is contained in:
Duarte Nunes
2017-04-05 00:05:09 +02:00
parent d216c3dbd2
commit 8cc29f84fb
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
idl-compiler.py
View File

@@ -784,17 +784,29 @@ def add_view(hout, info):
""")).substitute({'type' : cls["name"]}))
skip = "" if is_final(cls) else "ser::skip(in, boost::type<size_type>());"
local_names = {}
for m in members:
name = get_member_name(m["name"])
local_names[name] = "this->" + name + "()"
full_type = param_view_type(m["type"])
if "attribute" in m:
deflt = m["default"][0] if "default" in m else param_type(m["type"]) + "()"
if deflt in local_names:
deflt = local_names[deflt]
deser = Template("(in.size()>0) ? $func(in, boost::type<$typ>()) : $default").substitute(
{'func' : DESERIALIZER, 'typ' : full_type, 'default': deflt})
else:
deser = Template("$func(in, boost::type<$typ>())").substitute({'func' : DESERIALIZER, 'typ' : full_type})
fprintln(hout, Template(reindent(4, """
auto $name() const {
return seastar::with_serialized_stream(v, [] (auto& v) {
return seastar::with_serialized_stream(v, [this] (auto& v) {
auto in = v;
$skip
return deserialize(in, boost::type<$type>());
return $deser;
});
}
""")).substitute({'name' : get_member_name(m["name"]), 'type' : full_type, 'skip' : skip}))
""")).substitute({'name' : name, 'type' : full_type, 'skip' : skip, 'deser' : deser}))
skip = skip + Template("\n ser::skip(in, boost::type<${type}>());").substitute({'type': full_type})

2
idl/query.idl.hh
View File

@@ -7,7 +7,7 @@ class qr_cell stub [[writable]] {
// Specified by CQL binary protocol, according to cql_serialization_format in read_command.
bytes value;
std::experimental::optional<gc_clock::duration> ttl [[version 1.3]] = { }; // present when send_ttl option set in partition_slice
std::experimental::optional<gc_clock::duration> ttl [[version 1.3]]; // present when send_ttl option set in partition_slice
};
class qr_row stub [[writable]] {