forked from hyperledger-iroha/iroha-dco
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor/move query execution (hyperledger-iroha#1246)
* Move QueryProcessor out of model Signed-off-by: Dumitru <[email protected]> * Link query_execution Signed-off-by: Dumitru <[email protected]> * Resolve conflicts Signed-off-by: Dumitru <[email protected]> * Improve codestyle Signed-off-by: Dumitru <[email protected]> * Refactor CMakeLists.txt Signed-off-by: Dumitru <[email protected]>
- Loading branch information
1 parent
85b65e4
commit 039f74a
Showing
16 changed files
with
175 additions
and
169 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| /** | ||
| * Copyright Soramitsu Co., Ltd. 2018 All Rights Reserved. | ||
| * http://soramitsu.co.jp | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| #ifndef IROHA_QUERY_EXECUTION_HPP | ||
| #define IROHA_QUERY_EXECUTION_HPP | ||
|
|
||
| #include "ametsuchi/block_query.hpp" | ||
| #include "ametsuchi/wsv_query.hpp" | ||
| #include "builders/protobuf/builder_templates/query_response_template.hpp" | ||
|
|
||
| namespace shared_model { | ||
| namespace interface { | ||
| class QueryResponse; | ||
| class Query; | ||
| } // namespace interface | ||
| } // namespace shared_model | ||
|
|
||
| namespace iroha { | ||
|
|
||
| /** | ||
| * Converting model objects to protobuf and vice versa | ||
| */ | ||
| class QueryProcessingFactory { | ||
| using QueryResponseBuilder = | ||
| shared_model::proto::TemplateQueryResponseBuilder<0>; | ||
|
|
||
| using QueryResponseBuilderDone = | ||
| shared_model::proto::TemplateQueryResponseBuilder<1>; | ||
|
|
||
| public: | ||
| /** | ||
| * Execute and validate query. | ||
| * | ||
| * @param query | ||
| * @return shared pointer to query response | ||
| */ | ||
| std::shared_ptr<shared_model::interface::QueryResponse> validateAndExecute( | ||
| const shared_model::interface::Query &query); | ||
| /** | ||
| * | ||
| * @param wsvQuery | ||
| * @param blockQuery | ||
| */ | ||
| QueryProcessingFactory(std::shared_ptr<ametsuchi::WsvQuery> wsvQuery, | ||
| std::shared_ptr<ametsuchi::BlockQuery> blockQuery); | ||
|
|
||
| private: | ||
| bool validate(const shared_model::interface::Query &query, | ||
| const shared_model::interface::GetAssetInfo &get_asset_info); | ||
|
|
||
| bool validate(const shared_model::interface::Query &query, | ||
| const shared_model::interface::GetRoles &get_roles); | ||
|
|
||
| bool validate(const shared_model::interface::Query &query, | ||
| const shared_model::interface::GetRolePermissions | ||
| &get_role_permissions); | ||
|
|
||
| bool validate( | ||
| const shared_model::interface::Query &query, | ||
| const shared_model::interface::GetAccountAssets &get_account_assets); | ||
|
|
||
| bool validate(const shared_model::interface::Query &query, | ||
| const shared_model::interface::GetAccount &get_account); | ||
|
|
||
| bool validate( | ||
| const shared_model::interface::Query &query, | ||
| const shared_model::interface::GetSignatories &get_signatories); | ||
|
|
||
| bool validate(const shared_model::interface::Query &query, | ||
| const shared_model::interface::GetAccountTransactions | ||
| &get_account_transactions); | ||
|
|
||
| bool validate(const shared_model::interface::Query &query, | ||
| const shared_model::interface::GetAccountAssetTransactions | ||
| &get_account_asset_transactions); | ||
|
|
||
| bool validate( | ||
| const shared_model::interface::Query &query, | ||
| const shared_model::interface::GetAccountDetail &get_account_detail); | ||
|
|
||
| bool validate( | ||
| const shared_model::interface::Query &query, | ||
| const shared_model::interface::GetTransactions &get_transactions); | ||
|
|
||
| QueryResponseBuilderDone executeGetAssetInfo( | ||
| const shared_model::interface::GetAssetInfo &get_asset_info); | ||
|
|
||
| QueryResponseBuilderDone executeGetRoles( | ||
| const shared_model::interface::GetRoles &query); | ||
|
|
||
| QueryResponseBuilderDone executeGetRolePermissions( | ||
| const shared_model::interface::GetRolePermissions &query); | ||
|
|
||
| QueryResponseBuilderDone executeGetAccountAssets( | ||
| const shared_model::interface::GetAccountAssets &query); | ||
|
|
||
| QueryResponseBuilderDone executeGetAccountDetail( | ||
| const shared_model::interface::GetAccountDetail &query); | ||
|
|
||
| QueryResponseBuilderDone executeGetAccount( | ||
| const shared_model::interface::GetAccount &query); | ||
|
|
||
| QueryResponseBuilderDone executeGetSignatories( | ||
| const shared_model::interface::GetSignatories &query); | ||
|
|
||
| QueryResponseBuilderDone executeGetAccountAssetTransactions( | ||
| const shared_model::interface::GetAccountAssetTransactions &query); | ||
|
|
||
| QueryResponseBuilderDone executeGetAccountTransactions( | ||
| const shared_model::interface::GetAccountTransactions &query); | ||
|
|
||
| QueryResponseBuilderDone executeGetTransactions( | ||
| const shared_model::interface::GetTransactions &query, | ||
| const shared_model::interface::types::AccountIdType &accountId); | ||
|
|
||
| std::shared_ptr<ametsuchi::WsvQuery> _wsvQuery; | ||
| std::shared_ptr<ametsuchi::BlockQuery> _blockQuery; | ||
| }; | ||
|
|
||
| } // namespace iroha | ||
|
|
||
| #endif // IROHA_QUERY_EXECUTION_HPP |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,138 +0,0 @@ | ||
| /** | ||
| * Copyright Soramitsu Co., Ltd. 2017 All Rights Reserved. | ||
| * http://soramitsu.co.jp | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| #ifndef IROHA_QUERY_EXECUTION_HPP | ||
| #define IROHA_QUERY_EXECUTION_HPP | ||
|
|
||
| #include "ametsuchi/block_query.hpp" | ||
| #include "ametsuchi/wsv_query.hpp" | ||
| #include "builders/protobuf/builder_templates/query_response_template.hpp" | ||
|
|
||
| namespace shared_model { | ||
| namespace interface { | ||
| class QueryResponse; | ||
| class Query; | ||
| } // namespace interface | ||
| } // namespace shared_model | ||
|
|
||
| namespace iroha { | ||
| namespace model { | ||
|
|
||
| /** | ||
| * Converting business objects to protobuf and vice versa | ||
| */ | ||
| class QueryProcessingFactory { | ||
| using QueryResponseBuilder = | ||
| shared_model::proto::TemplateQueryResponseBuilder<0>; | ||
|
|
||
| using QueryResponseBuilderDone = | ||
| shared_model::proto::TemplateQueryResponseBuilder<1>; | ||
|
|
||
| public: | ||
| /** | ||
| * Execute and validate query. | ||
| * | ||
| * @param query | ||
| * @return | ||
| */ | ||
| std::shared_ptr<shared_model::interface::QueryResponse> execute( | ||
| const shared_model::interface::Query &query); | ||
| /** | ||
| * | ||
| * @param wsvQuery | ||
| * @param blockQuery | ||
| */ | ||
| QueryProcessingFactory(std::shared_ptr<ametsuchi::WsvQuery> wsvQuery, | ||
| std::shared_ptr<ametsuchi::BlockQuery> blockQuery); | ||
|
|
||
| private: | ||
| bool validate( | ||
| const shared_model::interface::Query &query, | ||
| const shared_model::interface::GetAssetInfo &get_asset_info); | ||
|
|
||
| bool validate(const shared_model::interface::Query &query, | ||
| const shared_model::interface::GetRoles &get_roles); | ||
|
|
||
| bool validate(const shared_model::interface::Query &query, | ||
| const shared_model::interface::GetRolePermissions | ||
| &get_role_permissions); | ||
|
|
||
| bool validate( | ||
| const shared_model::interface::Query &query, | ||
| const shared_model::interface::GetAccountAssets &get_account_assets); | ||
|
|
||
| bool validate(const shared_model::interface::Query &query, | ||
| const shared_model::interface::GetAccount &get_account); | ||
|
|
||
| bool validate( | ||
| const shared_model::interface::Query &query, | ||
| const shared_model::interface::GetSignatories &get_signatories); | ||
|
|
||
| bool validate(const shared_model::interface::Query &query, | ||
| const shared_model::interface::GetAccountTransactions | ||
| &get_account_transactions); | ||
|
|
||
| bool validate(const shared_model::interface::Query &query, | ||
| const shared_model::interface::GetAccountAssetTransactions | ||
| &get_account_asset_transactions); | ||
|
|
||
| bool validate( | ||
| const shared_model::interface::Query &query, | ||
| const shared_model::interface::GetAccountDetail &get_account_detail); | ||
|
|
||
| bool validate( | ||
| const shared_model::interface::Query &query, | ||
| const shared_model::interface::GetTransactions &get_transactions); | ||
|
|
||
| QueryResponseBuilderDone executeGetAssetInfo( | ||
| const shared_model::interface::GetAssetInfo &get_asset_info); | ||
|
|
||
| QueryResponseBuilderDone executeGetRoles( | ||
| const shared_model::interface::GetRoles &query); | ||
|
|
||
| QueryResponseBuilderDone executeGetRolePermissions( | ||
| const shared_model::interface::GetRolePermissions &query); | ||
|
|
||
| QueryResponseBuilderDone executeGetAccountAssets( | ||
| const shared_model::interface::GetAccountAssets &query); | ||
|
|
||
| QueryResponseBuilderDone executeGetAccountDetail( | ||
| const shared_model::interface::GetAccountDetail &query); | ||
|
|
||
| QueryResponseBuilderDone executeGetAccount( | ||
| const shared_model::interface::GetAccount &query); | ||
|
|
||
| QueryResponseBuilderDone executeGetSignatories( | ||
| const shared_model::interface::GetSignatories &query); | ||
|
|
||
| QueryResponseBuilderDone executeGetAccountAssetTransactions( | ||
| const shared_model::interface::GetAccountAssetTransactions &query); | ||
|
|
||
| QueryResponseBuilderDone executeGetAccountTransactions( | ||
| const shared_model::interface::GetAccountTransactions &query); | ||
|
|
||
| QueryResponseBuilderDone executeGetTransactions( | ||
| const shared_model::interface::GetTransactions &q, | ||
| const shared_model::interface::types::AccountIdType &accountId); | ||
|
|
||
| std::shared_ptr<ametsuchi::WsvQuery> _wsvQuery; | ||
| std::shared_ptr<ametsuchi::BlockQuery> _blockQuery; | ||
| }; | ||
|
|
||
| } // namespace model | ||
| } // namespace iroha | ||
|
|
||
| #endif // IROHA_QUERY_EXECUTION_HPP | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,6 @@ add_library(processors | |
| ) | ||
|
|
||
| target_link_libraries(processors PUBLIC | ||
| model | ||
| rxcpp | ||
| logger | ||
| endpoint | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.