mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-04-28 04:06:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

cql3: fix max() function

Browse Source 
Registration was done with a null shared_ptr<> instead of make_shared(),
and as a result the max template wasn't even instantiated, so it did not
even build.
This commit is contained in:
Avi Kivity
2015-04-01 20:17:10 +03:00
parent 955f1ebf06
commit 03bbcf55c2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cql3/functions/aggregate_fcts.hh
View File

@@ -142,20 +142,20 @@ public:
virtual void reset() override {
_max = {};
}
virtual opt_bytes compute() override {
virtual opt_bytes compute(int protocol_version) override {
if (!_max) {
return {};
}
return data_type_for<Type>().decompose(*_max);
return data_type_for<Type>()->decompose(*_max);
}
virtual void add_input(int protocol_version, const std::vector<opt_bytes>& values) override {
if (!values[0]) {
return;
}
auto val = boost::any_cast<Type>(data_type_for<Type>()->compose(*values[0]));
if (!_max) {
_max = values[0];
_max = val;
} else {
auto val = boost::any_cast<Type>(data_type_for<Type>().compose(*values[0]));
_max = std::max(*_max, val);
}
}
@@ -179,7 +179,7 @@ public:
template <typename Type>
shared_ptr<aggregate_function>
make_max_function() {
return shared_ptr<max_function_for<Type>>();
return make_shared<max_function_for<Type>>();
}
template <typename Type>