Skip to content

PROTON-1442: [Cpp] Support for local transactions #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 21 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ set(qpid-proton-cpp-source
src/terminus.cpp
src/timestamp.cpp
src/tracker.cpp
src/transaction_handler.cpp
src/transfer.cpp
src/transport.cpp
src/type_id.cpp
Expand Down
4 changes: 3 additions & 1 deletion cpp/examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ foreach(example
scheduled_send
service_bus
multithreaded_client
multithreaded_client_flow_control)
multithreaded_client_flow_control
tx_send
tx_recv)
add_executable(${example} ${example}.cpp)
target_link_libraries(${example} Proton::cpp Threads::Threads)
endforeach()
Expand Down
12 changes: 9 additions & 3 deletions cpp/examples/simple_recv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,11 @@ class simple_recv : public proton::messaging_handler {
proton::receiver receiver;
int expected;
int received;
bool verbose;

public:
simple_recv(const std::string &s, const std::string &u, const std::string &p, int c) :
url(s), user(u), password(p), expected(c), received(0) {}
simple_recv(const std::string &s, const std::string &u, const std::string &p, int c, bool verbose) :
url(s), user(u), password(p), expected(c), received(0), verbose(verbose) {}

void on_container_start(proton::container &c) override {
proton::connection_options co;
Expand All @@ -61,6 +62,9 @@ class simple_recv : public proton::messaging_handler {
}

if (expected == 0 || received < expected) {
if (verbose) {
std::cout << msg << ": ";
}
std::cout << msg.body() << std::endl;
received++;

Expand All @@ -77,18 +81,20 @@ int main(int argc, char **argv) {
std::string user;
std::string password;
int message_count = 100;
bool verbose;
example::options opts(argc, argv);

opts.add_value(address, 'a', "address", "connect to and receive from URL", "URL");
opts.add_value(message_count, 'm', "messages", "receive COUNT messages", "COUNT");
opts.add_value(user, 'u', "user", "authenticate as USER", "USER");
opts.add_value(password, 'p', "password", "authenticate with PASSWORD", "PASSWORD");
opts.add_flag(verbose, 'v', "verbose", "show whole message contents");


try {
opts.parse();

simple_recv recv(address, user, password, message_count);
simple_recv recv(address, user, password, message_count, verbose);
proton::container(recv).run();

return 0;
Expand Down
123 changes: 123 additions & 0 deletions cpp/examples/tx_recv.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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.
*
*/

#include "options.hpp"

#include <proton/connection.hpp>
#include <proton/container.hpp>
#include <proton/message.hpp>
#include <proton/message_id.hpp>
#include <proton/messaging_handler.hpp>
#include <proton/types.hpp>
#include <proton/transaction_handler.hpp>

#include <iostream>
#include <map>
#include <string>

#include <chrono>
#include <thread>

class tx_recv : public proton::messaging_handler, proton::transaction_handler {
private:
proton::receiver receiver;
std::string url;
int expected;
int batch_size;
int current_batch = 0;
int committed = 0;

proton::session session;
public:
tx_recv(const std::string &s, int c, int b):
url(s), expected(c), batch_size(b) {}

void on_container_start(proton::container &c) override {
receiver = c.open_receiver(url);
}

void on_session_open(proton::session &s) override {
session = s;
std::cout << "Session open, declare_txn" << std::endl;
s.declare_transaction(*this);
}

void on_transaction_declare_failed(proton::session) {}
void on_transaction_commit_failed(proton::session s) {
std::cout << "Transaction Commit Failed" << std::endl;
s.connection().close();
exit(-1);
}

void on_transaction_declared(proton::session s) override {
std::cout << "Transaction is declared!" << (&s)
<< std::endl;
receiver.add_credit(batch_size);
}

void on_message(proton::delivery &d, proton::message &msg) override {
std::cout<<"# MESSAGE: " << msg.id() <<": " << msg.body() << std::endl;
session.txn_accept(d);
Copy link
Member

Choose a reason for hiding this comment

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

session == d.session()

current_batch += 1;
if(current_batch == batch_size) {
}
}

void on_transaction_committed(proton::session s) override {
committed += current_batch;
current_batch = 0;
std::cout<<"Transaction Committed:"<< committed<< std::endl;
if(committed == expected) {
std::cout << "All messages committed" << std::endl;
s.connection().close();
}
else {
s.declare_transaction(*this);
}
}

};

int main(int argc, char **argv) {
std::string address("127.0.0.1:5672/examples");
int message_count = 6;
int batch_size = 3;
example::options opts(argc, argv);

opts.add_value(address, 'a', "address", "connect and send to URL", "URL");
opts.add_value(message_count, 'm', "messages", "number of messages to send", "COUNT");
opts.add_value(batch_size, 'b', "batch_size", "number of messages in each transaction", "BATCH_SIZE");

try {
opts.parse();

tx_recv recv(address, message_count, batch_size);
proton::container(recv).run();

return 0;
} catch (const example::bad_option& e) {
std::cout << opts << std::endl << e.what() << std::endl;
} catch (const std::exception& e) {
std::cerr << e.what() << std::endl;
}

return 1;
}
164 changes: 164 additions & 0 deletions cpp/examples/tx_send.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you 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.
*
*/

#include "options.hpp"

#include <proton/connection.hpp>
#include <proton/container.hpp>
#include <proton/message.hpp>
#include <proton/message_id.hpp>
#include <proton/messaging_handler.hpp>
#include <proton/types.hpp>
#include <proton/transaction_handler.hpp>

#include <iostream>
#include <map>
#include <string>

#include <atomic>
#include <chrono>
#include <thread>

class tx_send : public proton::messaging_handler, proton::transaction_handler {
private:
proton::sender sender;
std::string url;
int total;
int batch_size;
int sent;
int batch_index = 0;
int current_batch = 0;
int committed = 0;

public:
tx_send(const std::string &s, int c, int b):
url(s), total(c), batch_size(b), sent(0) {}

void on_container_start(proton::container &c) override {
sender = c.open_sender(url);
}

void on_session_open(proton::session &s) override {
std::cout << "New session is open, declaring transaction now..." << std::endl;
s.declare_transaction(*this);
}

void on_transaction_declare_failed(proton::session s) {
std::cout << "Transaction declarion failed" << std::endl;
s.connection().close();
exit(-1);
}

void on_transaction_commit_failed(proton::session s) {
std::cout << "Transaction commit failed!" << std::endl;
s.connection().close();
exit(-1);
}

void on_transaction_declared(proton::session s) override {
std::cout << "Transaction is declared" << std::endl;
send();
}

void on_sendable(proton::sender&) override {
send();
}

void send() {
std::atomic<int> unique_id(10000);
proton::session session = sender.session();
while (session.txn_is_declared() && sender.credit() &&
(committed + current_batch) < total) {
proton::message msg;
std::map<std::string, int> m;
m["sequence"] = committed + current_batch;

msg.id(std::atomic_fetch_add(&unique_id, 1));
msg.body(m);
std::cout << "Sending: " << msg << std::endl;
session.txn_send(sender, msg);
Copy link
Member

Choose a reason for hiding this comment

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

I think the API we were aiming for would just use a sender object created from the transactioned session.

current_batch += 1;
if(current_batch == batch_size)
{
if (batch_index % 2 == 0) {
std::cout << "Commiting transaction..." << std::endl;
session.txn_commit();
} else {
std::cout << "Aborting transaction..." << std::endl;
session.txn_abort();
}
batch_index++;
}
}
}

void on_transaction_committed(proton::session s) override {
committed += current_batch;
current_batch = 0;
std::cout << "Transaction commited" << std::endl;
if(committed == total) {
std::cout << "All messages committed, closing connection." << std::endl;
s.connection().close();
}
else {
std::cout << "Re-declaring transaction now..." << std::endl;
s.declare_transaction(*this);
}
}

void on_transaction_aborted(proton::session s) override {
std::cout << "Transaction aborted!" << std::endl;
std::cout << "Re-delaring transaction now..." << std::endl;
current_batch = 0;
s.declare_transaction(*this);
}

void on_sender_close(proton::sender &s) override {
current_batch = 0;
}

};

int main(int argc, char **argv) {
std::string address("127.0.0.1:5672/examples");
int message_count = 6;
int batch_size = 3;
example::options opts(argc, argv);

opts.add_value(address, 'a', "address", "connect and send to URL", "URL");
opts.add_value(message_count, 'm', "messages", "number of messages to send", "COUNT");
opts.add_value(batch_size, 'b', "batch_size", "number of messages in each transaction", "BATCH_SIZE");

try {
opts.parse();

tx_send send(address, message_count, batch_size);
proton::container(send).run();

return 0;
} catch (const example::bad_option& e) {
std::cout << opts << std::endl << e.what() << std::endl;
} catch (const std::exception& e) {
std::cerr << e.what() << std::endl;
}

return 1;
}
1 change: 1 addition & 0 deletions cpp/include/proton/fwd.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ class source_options;
class ssl;
class target_options;
class tracker;
class transaction_handler;
class transport;
class url;
class void_function0;
Expand Down
Loading