From 725f148ddbc651f5730223a3a46dfd9daffaf923 Mon Sep 17 00:00:00 2001 From: Daniele Sciascia Date: Thu, 10 Oct 2019 12:40:21 +0200 Subject: [PATCH] Remove `query()` method from `wsrep::client_service` interface --- dbsim/db_client_service.hpp | 1 - include/wsrep/client_service.hpp | 2 -- src/transaction.cpp | 1 - test/mock_client_state.hpp | 2 -- 4 files changed, 6 deletions(-) diff --git a/dbsim/db_client_service.hpp b/dbsim/db_client_service.hpp index 9a39a7e..4055b8b 100644 --- a/dbsim/db_client_service.hpp +++ b/dbsim/db_client_service.hpp @@ -33,7 +33,6 @@ namespace db public: client_service(db::client& client); - std::string query() const override { return ""; } bool interrupted(wsrep::unique_lock&) const override { return false; } diff --git a/include/wsrep/client_service.hpp b/include/wsrep/client_service.hpp index d81d3a7..b4d8abd 100644 --- a/include/wsrep/client_service.hpp +++ b/include/wsrep/client_service.hpp @@ -40,8 +40,6 @@ namespace wsrep client_service() { } virtual ~client_service() { } - virtual std::string query() const = 0; - /** * Return true if the current transaction has been interrupted * by the DBMS. The lock which is passed to interrupted call diff --git a/src/transaction.cpp b/src/transaction.cpp index ca6fd06..25f2bc2 100644 --- a/src/transaction.cpp +++ b/src/transaction.cpp @@ -1781,7 +1781,6 @@ void wsrep::transaction::debug_log_state( << ", sr_rb: " << streaming_context_.rolled_back() << "\n own: " << (client_state_.owning_thread_id_ == wsrep::this_thread::get_id()) << " thread_id: " << client_state_.owning_thread_id_ - << "\n query: " << client_service_.query() << ""); } diff --git a/test/mock_client_state.hpp b/test/mock_client_state.hpp index 9610457..095b2b9 100644 --- a/test/mock_client_state.hpp +++ b/test/mock_client_state.hpp @@ -76,8 +76,6 @@ namespace wsrep , aborts_() { } - std::string query() const WSREP_OVERRIDE { return ""; } - int bf_rollback() WSREP_OVERRIDE; bool interrupted(wsrep::unique_lock&)