Skip to content

Commit

Permalink
make test pass for Ubuntu-24.04
Browse files Browse the repository at this point in the history
  • Loading branch information
@t-horikawa
t-horikawa committed Jun 10, 2024
1 parent d77ccec commit bfca9f4
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 52 deletions.
52 changes: 26 additions & 26 deletions test/ogawayama/stub/ApiTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ TEST_F(ApiTest, begin_commit) {
b.set_allocated_success(&s);
server_->response_message(b);
EXPECT_EQ(ERROR_CODE::OK, connection->begin(transaction));
s.release_transaction_handle();
s.release_transaction_id();
b.release_success();
(void) s.release_transaction_handle();
(void) s.release_transaction_id();
(void) b.release_success();

std::optional<jogasaki::proto::sql::request::Request> request_opt = server_->request_message();
EXPECT_TRUE(request_opt);
Expand All @@ -79,8 +79,8 @@ TEST_F(ApiTest, begin_commit) {
server_->response_message(rod, 1);

EXPECT_EQ(ERROR_CODE::OK, transaction->commit());
roc.release_success();
rod.release_success();
(void) roc.release_success();
(void) rod.release_success();

std::optional<jogasaki::proto::sql::request::Request> requestc_opt = server_->request_message();
EXPECT_TRUE(requestc_opt);
Expand Down Expand Up @@ -128,9 +128,9 @@ TEST_F(ApiTest, long_transaction) {
b.set_allocated_success(&s);
server_->response_message(b);
EXPECT_EQ(ERROR_CODE::OK, connection->begin(option, transaction));
s.release_transaction_handle();
s.release_transaction_id();
b.release_success();
(void) s.release_transaction_handle();
(void) s.release_transaction_id();
(void) b.release_success();

std::optional<jogasaki::proto::sql::request::Request> request_opt = server_->request_message();
EXPECT_TRUE(request_opt);
Expand Down Expand Up @@ -161,8 +161,8 @@ TEST_F(ApiTest, long_transaction) {
server_->response_message(rod, 1);

EXPECT_EQ(ERROR_CODE::OK, transaction->commit());
roc.release_success();
rod.release_success();
(void) roc.release_success();
(void) rod.release_success();

std::optional<jogasaki::proto::sql::request::Request> request_opt = server_->request_message();
EXPECT_TRUE(request_opt);
Expand Down Expand Up @@ -210,9 +210,9 @@ TEST_F(ApiTest, long_transaction_inclusive_read_area) {
b.set_allocated_success(&s);
server_->response_message(b);
EXPECT_EQ(ERROR_CODE::OK, connection->begin(option, transaction));
s.release_transaction_handle();
s.release_transaction_id();
b.release_success();
(void) s.release_transaction_handle();
(void) s.release_transaction_id();
(void) b.release_success();

std::optional<jogasaki::proto::sql::request::Request> request_opt = server_->request_message();
EXPECT_TRUE(request_opt);
Expand Down Expand Up @@ -243,8 +243,8 @@ TEST_F(ApiTest, long_transaction_inclusive_read_area) {
server_->response_message(rod, 1);

EXPECT_EQ(ERROR_CODE::OK, transaction->commit());
roc.release_success();
rod.release_success();
(void) roc.release_success();
(void) rod.release_success();

std::optional<jogasaki::proto::sql::request::Request> requestc_opt = server_->request_message();
EXPECT_TRUE(requestc_opt);
Expand Down Expand Up @@ -292,9 +292,9 @@ TEST_F(ApiTest, long_transaction_exclusive_read_area) {
b.set_allocated_success(&s);
server_->response_message(b);
EXPECT_EQ(ERROR_CODE::OK, connection->begin(option, transaction));
s.release_transaction_handle();
s.release_transaction_id();
b.release_success();
(void) s.release_transaction_handle();
(void) s.release_transaction_id();
(void) b.release_success();

std::optional<jogasaki::proto::sql::request::Request> request_opt = server_->request_message();
EXPECT_TRUE(request_opt);
Expand Down Expand Up @@ -325,8 +325,8 @@ TEST_F(ApiTest, long_transaction_exclusive_read_area) {
server_->response_message(rod, 1);

EXPECT_EQ(ERROR_CODE::OK, transaction->commit());
roc.release_success();
rod.release_success();
(void) roc.release_success();
(void) rod.release_success();

std::optional<jogasaki::proto::sql::request::Request> requestc_opt = server_->request_message();
EXPECT_TRUE(requestc_opt);
Expand Down Expand Up @@ -363,9 +363,9 @@ TEST_F(ApiTest, result_set) {
b.set_allocated_success(&s);
server_->response_message(b);
EXPECT_EQ(ERROR_CODE::OK, connection->begin(transaction));
s.release_transaction_handle();
s.release_transaction_id();
b.release_success();
(void) s.release_transaction_handle();
(void) s.release_transaction_id();
(void) b.release_success();

std::optional<jogasaki::proto::sql::request::Request> request_opt = server_->request_message();
EXPECT_TRUE(request_opt);
Expand Down Expand Up @@ -409,7 +409,7 @@ TEST_F(ApiTest, result_set) {
// set response
server_->response_with_resultset(m, resultset, ro);
// clear fields
ro.release_success();
(void) ro.release_success();
m.clear_columns();

EXPECT_EQ(ERROR_CODE::OK, transaction->execute_query("SELECT * FROM T2", result_set));
Expand Down Expand Up @@ -478,8 +478,8 @@ TEST_F(ApiTest, result_set) {
server_->response_message(rod, 1);

EXPECT_EQ(ERROR_CODE::OK, transaction->commit());
roc.release_success();
rod.release_success();
(void) roc.release_success();
(void) rod.release_success();

std::optional<jogasaki::proto::sql::request::Request> requestc_opt = server_->request_message();
EXPECT_TRUE(requestc_opt);
Expand Down
12 changes: 6 additions & 6 deletions test/ogawayama/stub/PreparedQueryTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ TEST_F(PreparedTest, prepare) {
b.set_allocated_success(&s);
server_->response_message(b);
EXPECT_EQ(ERROR_CODE::OK, connection->begin(transaction));
s.release_transaction_handle();
s.release_transaction_id();
b.release_success();
(void) s.release_transaction_handle();
(void) s.release_transaction_id();
(void) b.release_success();

std::optional<jogasaki::proto::sql::request::Request> request_opt = server_->request_message();
EXPECT_TRUE(request_opt);
Expand Down Expand Up @@ -185,7 +185,7 @@ TEST_F(PreparedTest, prepare) {
// set response
server_->response_with_resultset(m, resultset, ro);
// clear fields
ro.release_success();
(void) ro.release_success();
m.clear_columns();

// execute_query()
Expand Down Expand Up @@ -322,8 +322,8 @@ TEST_F(PreparedTest, prepare) {
server_->response_message(rod, 1);

EXPECT_EQ(ERROR_CODE::OK, transaction->commit());
roc.release_success();
rod.release_success();
(void) roc.release_success();
(void) rod.release_success();

std::optional<jogasaki::proto::sql::request::Request> requestc_opt = server_->request_message();
EXPECT_TRUE(requestc_opt);
Expand Down
12 changes: 6 additions & 6 deletions test/ogawayama/stub/PreparedStatementTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ TEST_F(PreparedTest, prepare) {
s.set_allocated_transaction_id(&tid);
b.set_allocated_success(&s);
server_->response_message(b);
s.release_transaction_handle();
s.release_transaction_id();
b.release_success();
(void) s.release_transaction_handle();
(void) s.release_transaction_id();
(void) b.release_success();

EXPECT_EQ(ERROR_CODE::OK, connection->begin(transaction));

Expand All @@ -157,7 +157,7 @@ TEST_F(PreparedTest, prepare) {
c->set_value(1234);
er.set_allocated_success(&s);
server_->response_message(er);
er.release_success();
(void) er.release_success();

// execute_statement()
ogawayama::stub::parameters_type parameters{};
Expand Down Expand Up @@ -260,8 +260,8 @@ TEST_F(PreparedTest, prepare) {
server_->response_message(rod, 1);

EXPECT_EQ(ERROR_CODE::OK, transaction->commit());
roc.release_success();
rod.release_success();
(void) roc.release_success();
(void) rod.release_success();

std::optional<jogasaki::proto::sql::request::Request> requestc_opt = server_->request_message();
EXPECT_TRUE(requestc_opt);
Expand Down
14 changes: 7 additions & 7 deletions test/ogawayama/stub/TwoResultsetOpenTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ TEST_F(TwoResultsetOpenTest, result_set) {
b.set_allocated_success(&s);
server_->response_message(b);
EXPECT_EQ(ERROR_CODE::OK, connection->begin(transaction));
s.release_transaction_handle();
s.release_transaction_id();
b.release_success();
(void) s.release_transaction_handle();
(void) s.release_transaction_id();
(void) b.release_success();

std::optional<jogasaki::proto::sql::request::Request> request_opt = server_->request_message();
EXPECT_TRUE(request_opt);
Expand Down Expand Up @@ -109,7 +109,7 @@ TEST_F(TwoResultsetOpenTest, result_set) {
// set response
server_->response_with_resultset(m, resultset_1, ro);
// clear fields
ro.release_success();
(void) ro.release_success();
m.clear_columns();

EXPECT_EQ(ERROR_CODE::OK, transaction->execute_query("SELECT * FROM T1", result_set_1));
Expand Down Expand Up @@ -160,7 +160,7 @@ TEST_F(TwoResultsetOpenTest, result_set) {
// set response
server_->response_with_resultset(m, resultset_2, ro, tateyama::bootstrap::wire::OPT_INDEX + 1);
// clear fields
ro.release_success();
(void) ro.release_success();
m.clear_columns();

EXPECT_EQ(ERROR_CODE::OK, transaction->execute_query("SELECT * FROM T2", result_set_2));
Expand Down Expand Up @@ -263,8 +263,8 @@ TEST_F(TwoResultsetOpenTest, result_set) {
server_->response_message(rod, 1);

EXPECT_EQ(ERROR_CODE::OK, transaction->commit());
roc.release_success();
rod.release_success();
(void) roc.release_success();
(void) rod.release_success();

std::optional<jogasaki::proto::sql::request::Request> requestc_opt = server_->request_message();
EXPECT_TRUE(requestc_opt);
Expand Down
14 changes: 7 additions & 7 deletions test/ogawayama/stub/stub_test_root.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ class server {
// set response
endpoint_.get_worker()->response_message(rh, resultset_name, resultset, rb, index);
// release
rb.release_result_only();
rh.release_execute_query();
e.release_record_meta();
(void) rb.release_result_only();
(void) rh.release_execute_query();
(void) e.release_record_meta();
}

std::optional<jogasaki::proto::sql::request::Request> request_message() {
Expand Down Expand Up @@ -112,14 +112,14 @@ inline void server::response_message<jogasaki::proto::sql::response::Begin>(joga
jogasaki::proto::sql::response::Response r{};
r.set_allocated_begin(&b);
endpoint_.get_worker()->response_message(r);
r.release_begin();
(void) r.release_begin();
}
template<>
inline void server::response_message<jogasaki::proto::sql::response::ResultOnly>(jogasaki::proto::sql::response::ResultOnly& ro, std::size_t index) {
jogasaki::proto::sql::response::Response r{};
r.set_allocated_result_only(&ro);
endpoint_.get_worker()->response_message(r, index);
r.release_result_only();
(void) r.release_result_only();
}
template<>
inline void server::response_message<jogasaki::proto::sql::response::ResultOnly>(jogasaki::proto::sql::response::ResultOnly& ro) {
Expand All @@ -130,14 +130,14 @@ inline void server::response_message<jogasaki::proto::sql::response::Prepare>(jo
jogasaki::proto::sql::response::Response r{};
r.set_allocated_prepare(&p);
endpoint_.get_worker()->response_message(r);
r.release_prepare();
(void) r.release_prepare();
}
template<>
inline void server::response_message<jogasaki::proto::sql::response::ExecuteResult>(jogasaki::proto::sql::response::ExecuteResult& er, std::size_t index) {
jogasaki::proto::sql::response::Response r{};
r.set_allocated_execute_result(&er);
endpoint_.get_worker()->response_message(r, index);
r.release_execute_result();
(void) r.release_execute_result();
}
template<>
inline void server::response_message<jogasaki::proto::sql::response::ExecuteResult>(jogasaki::proto::sql::response::ExecuteResult& er) {
Expand Down

1 comment on commit bfca9f4

@t-horikawa
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/project-tsurugi/tsurugi-issues/issues/769

Please sign in to comment.