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

cql3: make modification statement an execution stage

Browse Source
This commit is contained in:
Paweł Dziepak
2017-02-22 18:18:41 +00:00
parent d005b20071
commit dce785089a
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cql3/statements/modification_statement.cc
View File

@@ -51,6 +51,7 @@
#include <boost/range/algorithm_ext/push_back.hpp>
#include <boost/range/adaptor/filtered.hpp>
#include "service/storage_service.hh"
#include <seastar/core/execution_stage.hh>
namespace cql3 {
@@ -460,8 +461,18 @@ modification_statement::build_partition_keys(const query_options& options) {
return result;
}
struct modification_statement_executor {
static auto get() { return &modification_statement::do_execute; }
};
static thread_local auto modify_stage = seastar::make_execution_stage(modification_statement_executor::get());
future<::shared_ptr<transport::messages::result_message>>
modification_statement::execute(distributed<service::storage_proxy>& proxy, service::query_state& qs, const query_options& options) {
return modify_stage(this, seastar::ref(proxy), seastar::ref(qs), seastar::cref(options));
}
future<::shared_ptr<transport::messages::result_message>>
modification_statement::do_execute(distributed<service::storage_proxy>& proxy, service::query_state& qs, const query_options& options) {
if (has_conditions() && options.get_protocol_version() == 1) {
throw exceptions::invalid_request_exception("Conditional updates are not supported by the protocol version in use. You need to upgrade to a driver using the native protocol v2.");
}

5
cql3/statements/modification_statement.hh
View File

@@ -203,7 +203,10 @@ protected:
bool local,
db::consistency_level cl,
tracing::trace_state_ptr trace_state);
private:
future<::shared_ptr<transport::messages::result_message>>
do_execute(distributed<service::storage_proxy>& proxy, service::query_state& qs, const query_options& options);
friend class modification_statement_executor;
public:
bool has_conditions();