This is an automated email from the ASF dual-hosted git repository. isapego pushed a commit to branch IGNITE-22478 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit dc0b12b24dc9fae9245f776e1cbf286a589d653a Author: Igor Sapego <[email protected]> AuthorDate: Fri Jun 28 17:15:17 2024 +0200 IGNITE-22478 Fix tests --- .../cpp/ignite/client/compute/job_descriptor.h | 20 +++++++++++++++----- .../cpp/tests/client-test/ignite_runner_suite.h | 1 + .../client-test/schema_synchronization_test.cpp | 2 +- .../cpp/tests/test-common/basic_auth_test_suite.h | 2 +- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/modules/platforms/cpp/ignite/client/compute/job_descriptor.h b/modules/platforms/cpp/ignite/client/compute/job_descriptor.h index d895a18155..f483e45a39 100644 --- a/modules/platforms/cpp/ignite/client/compute/job_descriptor.h +++ b/modules/platforms/cpp/ignite/client/compute/job_descriptor.h @@ -21,6 +21,7 @@ #include "ignite/client/compute/job_execution_options.h" #include <string> +#include <utility> #include <vector> #include <memory> @@ -62,13 +63,22 @@ public: */ class builder { public: + /** + * Constructor. + * + * @param job_class_name Job class name. + */ + explicit builder(std::string job_class_name) { + m_descriptor->m_job_class_name = std::move(job_class_name); + } + /** * Set job class name. * * @param job_class_name Job class name. */ - builder& set_job_class_name(const std::string &job_class_name) { - m_descriptor->m_job_class_name = job_class_name; + builder& job_class_name(std::string job_class_name) { + m_descriptor->m_job_class_name = std::move(job_class_name); return *this; } @@ -77,7 +87,7 @@ public: * * @param units Deployment units to set. */ - builder& set_deployment_units(std::vector<deployment_unit> units) { + builder& deployment_units(std::vector<deployment_unit> units) { m_descriptor->m_units = std::move(units); return *this; } @@ -87,8 +97,8 @@ public: * * @param options Execution options. */ - builder& set_execution_options(const job_execution_options &options) { - m_descriptor->m_options = options; + builder& execution_options(job_execution_options options) { + m_descriptor->m_options = std::move(options); // NOLINT(*-move-const-arg) return *this; } diff --git a/modules/platforms/cpp/tests/client-test/ignite_runner_suite.h b/modules/platforms/cpp/tests/client-test/ignite_runner_suite.h index de50312392..905afb6103 100644 --- a/modules/platforms/cpp/tests/client-test/ignite_runner_suite.h +++ b/modules/platforms/cpp/tests/client-test/ignite_runner_suite.h @@ -52,6 +52,7 @@ public: inline static const std::string NODE_NAME_JOB = IT_THIN_CLIENT_COMPUTE_TEST + "$NodeNameJob"; inline static const std::string SLEEP_JOB = IT_THIN_CLIENT_COMPUTE_TEST + "$SleepJob"; + inline static const std::string TO_STRING_JOB = IT_THIN_CLIENT_COMPUTE_TEST + "ToStringJob"; inline static const std::string CONCAT_JOB = IT_THIN_CLIENT_COMPUTE_TEST + "$ConcatJob"; inline static const std::string ERROR_JOB = IT_THIN_CLIENT_COMPUTE_TEST + "$IgniteExceptionJob"; inline static const std::string ECHO_JOB = IT_THIN_CLIENT_COMPUTE_TEST + "$EchoJob"; diff --git a/modules/platforms/cpp/tests/client-test/schema_synchronization_test.cpp b/modules/platforms/cpp/tests/client-test/schema_synchronization_test.cpp index 42eb8fcdc6..690ef7df23 100644 --- a/modules/platforms/cpp/tests/client-test/schema_synchronization_test.cpp +++ b/modules/platforms/cpp/tests/client-test/schema_synchronization_test.cpp @@ -98,7 +98,7 @@ TEST_F(schema_synchronization_test, upsert_add_column_compute) { tuple_view.upsert(nullptr, val1); m_client.get_sql().execute(nullptr, {"ALTER TABLE SCHEMA_SYN_TEST ADD COLUMN VAL2 INT"}, {}); - auto descriptor = job_descriptor::builder().set_job_class_name(NODE_NAME_JOB).build(); + auto descriptor = job_descriptor::builder(NODE_NAME_JOB).build(); m_client.get_compute().submit_colocated("SCHEMA_SYN_TEST", {key}, descriptor, {}).get_result(); } diff --git a/modules/platforms/cpp/tests/test-common/basic_auth_test_suite.h b/modules/platforms/cpp/tests/test-common/basic_auth_test_suite.h index 8f2c8e1074..ae83ef3ed7 100644 --- a/modules/platforms/cpp/tests/test-common/basic_auth_test_suite.h +++ b/modules/platforms/cpp/tests/test-common/basic_auth_test_suite.h @@ -97,7 +97,7 @@ public: auto client = ignite_client::start(cfg, std::chrono::seconds(30)); auto nodes = client.get_cluster_nodes(); - auto descriptor = job_descriptor::builder().set_job_class_name(ENABLE_AUTHN_JOB).build(); + auto descriptor = job_descriptor::builder(ENABLE_AUTHN_JOB).build(); client.get_compute().submit(nodes, descriptor, {enable ? 1 : 0}).get_result(); } catch (const ignite_error &) {
