Clean up the code

Author: DreamPearl

cpp/examples/tx_recv.cpp

@@ -46,7 +46,6 @@ class tx_recv : public proton::messaging_handler, proton::transaction_handler {
     int committed = 0;
 
     proton::session session;
-    // proton::transaction transaction;
   public:
     tx_recv(const std::string &s, int c, int b):
         url(s), expected(c), batch_size(b) {}
@@ -72,18 +71,14 @@ class tx_recv : public proton::messaging_handler, proton::transaction_handler {
     void on_transaction_declared(proton::session s) override {
         std::cout << "[on_transaction_declared] txn called " << (&s)
                   << std::endl;
-        // std::cout << "[on_transaction_declared] txn is_empty " << (t.is_empty())
-        //           << "\t" << transaction.is_empty() << std::endl;
-        receiver.add_credit(batch_size); 
-        // transaction = t;
+        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);
         current_batch += 1;
         if(current_batch == batch_size) {
-            // transaction = proton::transaction(); // null
         }
     }
 

cpp/examples/tx_send.cpp

@@ -49,7 +49,7 @@ class tx_send : public proton::messaging_handler, proton::transaction_handler {
     int confirmed = 0;
 
     proton::session session;
-    // proton::transaction transaction;
+
   public:
     tx_send(const std::string &s, int c, int b):
         url(s), total(c), batch_size(b), sent(0) {}
@@ -96,7 +96,7 @@ class tx_send : public proton::messaging_handler, proton::transaction_handler {
 
             msg.id(unique_id++);
             msg.body(m);
-            std::cout << "##### [example] transaction send msg: "  << msg
+            std::cout << "[example] transaction send msg: "  << msg
                       << std::endl;
             session.txn_send(sender, msg);
             current_batch += 1;

cpp/include/proton/session.hpp

@@ -109,13 +109,6 @@ PN_CPP_CLASS_EXTERN session : public internal::object<pn_session_t>, public endp
 
     PN_CPP_EXTERN void declare_transaction(proton::transaction_handler &handler, bool settle_before_discharge = false);
 
-
-    // static transaction mk_transaction_impl(sender &s, transaction_handler &h,
-                                          //  bool f);
-    // PN_CPP_EXTERN transaction(transaction_impl *impl);
-    
-    // PN_CPP_EXTERN transaction();
-    // PN_CPP_EXTERN ~transaction();
     PN_CPP_EXTERN bool txn_is_empty();
     PN_CPP_EXTERN bool txn_is_declared();
     PN_CPP_EXTERN void txn_commit();
@@ -126,10 +119,6 @@ PN_CPP_CLASS_EXTERN session : public internal::object<pn_session_t>, public endp
     PN_CPP_EXTERN void txn_accept(delivery &t);
     PN_CPP_EXTERN proton::connection txn_connection() const;
 
-    // PN_CPP_EXTERN session_context& get_session_context();
-
-    // transaction _txn;
-
     /// @cond INTERNAL
   friend class internal::factory<session>;
   friend class session_iterator;

cpp/include/proton/target.hpp

@@ -65,9 +65,6 @@ class target : public terminus {
     /// @endcond
 };
 
-
-/// TODO: A point of coordinator for messages.
-///
 class coordinator : public terminus {
   public:
     /// Create an empty coordinator.

cpp/include/proton/transaction.hpp

@@ -36,69 +36,6 @@
 namespace proton {
 
 class transaction_handler;
-// class transaction_impl;
-
-// TODO: This should not be accessible to users.
-// class transaction_impl {
-//   public:
-//     proton::sender txn_ctrl;
-//     proton::transaction_handler *handler = nullptr;
-//     proton::binary id;
-//     proton::tracker _declare;
-//     proton::tracker _discharge;
-//     bool failed = false;
-//     std::vector<proton::tracker> pending;
-
-//     void commit();
-//     void abort();
-//     void declare();
-//     proton::tracker send(proton::sender s, proton::message msg);
-
-//     void discharge(bool failed);
-//     void release_pending();
-//     void accept(delivery &d);
-//     void update(tracker &d, uint64_t state);
-//     void set_id(binary _id);
-
-//     proton::tracker send_ctrl(proton::symbol descriptor, proton::value _value);
-//     void handle_outcome(proton::tracker t);
-//     transaction_impl(proton::sender &_txn_ctrl,
-//                      proton::transaction_handler &_handler,
-//                      bool _settle_before_discharge);
-
-//     // delete copy and assignment operator to ensure no copy of this object is
-//     // every made transaction_impl(const transaction_impl&) = delete;
-//     // transaction_impl& operator=(const transaction_impl&) = delete;
-// };
-
-// class
-// PN_CPP_CLASS_EXTERN transaction {
-//   private:
-//     //   PN_CPP_EXTERN transaction(proton::sender& _txn_ctrl,
-//     //   proton::transaction_handler& _handler, bool _settle_before_discharge);
-
-//     static transaction mk_transaction_impl(sender &s, transaction_handler &h,
-//                                            bool f);
-//     PN_CPP_EXTERN transaction(transaction_impl *impl);
-//     transaction_impl *_impl;
-
-//   public:
-//     // TODO:
-//     // PN_CPP_EXTERN transaction(transaction &o);
-//     PN_CPP_EXTERN transaction();
-//     PN_CPP_EXTERN ~transaction();
-//     PN_CPP_EXTERN bool is_empty();
-//     PN_CPP_EXTERN void commit();
-//     PN_CPP_EXTERN void abort();
-//     PN_CPP_EXTERN void declare();
-//     PN_CPP_EXTERN void handle_outcome(proton::tracker);
-//     PN_CPP_EXTERN proton::tracker send(proton::sender s, proton::message msg);
-//     PN_CPP_EXTERN void accept(delivery &t);
-//     PN_CPP_EXTERN proton::connection connection() const;
-
-//   friend class transaction_impl;
-//   friend class session;
-// };
 
 class
 PN_CPP_CLASS_EXTERN transaction_handler {

cpp/include/proton/transfer.hpp

@@ -33,26 +33,9 @@
 /// @copybrief proton::transfer
 
 struct pn_delivery_t;
-// struct pn_disposition_t;
 
 namespace proton {
 
-// class disposition : public internal::object<pn_disposition_t> {
-//     /// @cond INTERNAL
-//     disposition(pn_disposition_t *d) : internal::object<pn_disposition_t>(d) {}
-//     /// @endcond
-
-//   public:
-//     /// Create an empty disposition.
-//     disposition() : internal::object<pn_disposition_t>(0) {}
-
-//     proton::value data() const;
-
-//     /// @cond INTERNAL
-//     friend class internal::factory<disposition>;
-//     /// @endcond
-// };
-
 /// The base class for delivery and tracker.
 class transfer : public internal::object<pn_delivery_t> {
     /// @cond INTERNAL
@@ -94,28 +77,20 @@ class transfer : public internal::object<pn_delivery_t> {
     /// Return true if the transfer has been settled.
     PN_CPP_EXTERN bool settled() const;
 
-   // Set transaction
-    // PN_CPP_EXTERN void transaction(transaction t);
-
-    // PN_CPP_EXTERN class transaction transaction() const;
-
     /// Set user data on this transfer.
     PN_CPP_EXTERN void user_data(void* user_data) const;
 
     /// Get user data from this transfer.
     PN_CPP_EXTERN void* user_data() const;
 
-    // PN_CPP_EXTERN disposition remote();
-    // PN_CPP_EXTERN disposition local();
-
     /// @cond INTERNAL
   friend class internal::factory<transfer>;
     /// @endcond
 };
 
-/// Human-readable name of the transfer::state
+/// Human-readalbe name of the transfer::state
 PN_CPP_EXTERN std::string to_string(enum transfer::state);
-/// Human-readable name of the transfer::state
+/// Human-readalbe name of the transfer::state
 PN_CPP_EXTERN std::ostream& operator<<(std::ostream&, const enum transfer::state);
 
 } // proton

cpp/src/contexts.hpp

@@ -42,7 +42,6 @@ namespace proton {
 
 class proton_handler;
 class connector;
-// class transaction;
 
 namespace io {class link_namer;}
 
@@ -153,6 +152,7 @@ class session_context : public context {
   public:
     session_context() : handler(0), user_data_(nullptr) {}
     static session_context& get(pn_session_t* s);
+
     transaction_impl* _txn_impl;
     messaging_handler* handler;
     void* user_data_;
@@ -163,7 +163,6 @@ class transfer_context : public context {
     transfer_context() : user_data_(nullptr) {}
     static transfer_context& get(pn_delivery_t* s);
 
-    // std::unique_ptr<transaction> transaction_;
     void* user_data_;
 };
 

cpp/src/messaging_adapter.cpp

@@ -112,6 +112,7 @@ void message_decode(message& msg, proton::delivery delivery) {
     msg.decode(buf);
     pn_link_advance(unwrap(link));
 }
+
 void on_delivery(messaging_handler& handler, pn_event_t* event) {
     pn_link_t *lnk = pn_event_link(event);
     pn_delivery_t *dlv = pn_event_delivery(event);
@@ -301,38 +302,25 @@ void on_link_local_open(messaging_handler& handler, pn_event_t* event) {
 void on_link_remote_open(messaging_handler& handler, pn_event_t* event) {
     auto lnk = pn_event_link(event);
     int type = pn_terminus_get_type(pn_link_remote_target(lnk));
-    std::cout << "    on_link_remote_open, type:" << type << std::endl;
     if (pn_terminus_get_type(pn_link_remote_target(lnk))==PN_COORDINATOR) {
       auto cond = pn_link_condition(lnk);
       if (pn_condition_is_set(cond)) {
-            std::cout<<"    Got condition on_link_remote_open(.PN_COORDINATOR): "
-                << pn_event_type_name(pn_event_type(event)) << " "
-                << pn_condition_get_name(cond) << " "
-                << pn_condition_get_description(cond) << std::endl;
-
             pn_condition_set_name(cond, "amqp:on_link_remote_open:FAILED");
             pn_link_close(lnk);
             return;
         }
-        std::cout<<"    IN on_link_remote_open(.PN_COORDINATOR) success " << std::endl;
-        std::cout<<"    IN on_link_remote_open(.PN_COORDINATOR) have handler " << &handler << std::endl;
-
       return;
     }
     if (pn_link_state(lnk) & PN_LOCAL_UNINIT) { // Incoming link
         // Copy source and target from remote end.
-          std::cout<<"    Inside on_link_remote_open() .. PN_LOCAL_UNINIT " << std::endl;
-
         pn_terminus_copy(pn_link_source(lnk), pn_link_remote_source(lnk));
         pn_terminus_copy(pn_link_target(lnk), pn_link_remote_target(lnk));
     }
     if (pn_link_is_receiver(lnk)) {
-          std::cout<<"    Inside on_link_remote_open() .. pn_link_is_receiver " << std::endl;
       receiver r(make_wrapper<receiver>(lnk));
       handler.on_receiver_open(r);
       credit_topup(lnk);
     } else {
-          std::cout<<"    Inside on_link_remote_open() .. sender " << std::endl;
       sender s(make_wrapper<sender>(lnk));
       handler.on_sender_open(s);
     }

cpp/src/proactor_container_impl.cpp

@@ -54,7 +54,7 @@
 #include <random>
 
 // XXXX: Debug
-#include <iostream>
+// #include <iostream>
 
 namespace proton {
 
@@ -866,45 +866,4 @@ void container::impl::stop(const proton::error_condition& err) {
     pn_condition_free(error_condition);
 }
 
-// TODO: declare this in separate internal header file
-// extern transaction mk_transaction_impl(sender&, transaction_handler&, bool);
-
-// transaction container::impl::declare_transaction(proton::connection conn, proton::transaction_handler &handler, bool settle_before_discharge) {
-//     class InternalTransactionHandler : public proton::messaging_handler {
-//         // TODO: auto_settle
-
-//         void on_tracker_settle(proton::tracker &t) override {
-//             std::cout<<"    [InternalTransactionHandler][on_tracker_settle] called with tracker.txn"
-//                  << std::endl;
-//             if (!t.transaction().is_empty()) {
-//                 t.transaction().handle_outcome(t);
-//             }
-//         }
-//     };
-
-//     proton::target_options t;
-//     std::vector<symbol> cap = {proton::symbol("amqp:local-transactions")};
-//     t.capabilities(cap);
-//     t.type(PN_COORDINATOR);
-
-//     proton::sender_options so;
-//     so.name("txn-ctrl");
-//     so.target(t);
-//     static InternalTransactionHandler internal_handler; // internal_handler going out of scope. Fix it
-//     so.handler(internal_handler);
-//     std::cout<<"    [declare_transaction] txn-name sender open with handler: " << &internal_handler << std::endl;
-
-//     static proton::sender s = conn.open_sender("does not matter", so);
-
-//     settle_before_discharge = false;
-
-//     std::cout<<"    [declare_transaction] calling mk_transaction_impl" << std::endl;
-
-//     auto txn =
-//         transaction::mk_transaction_impl(s, handler, settle_before_discharge);
-//     std::cout<<"    [declare_transaction] txn address:" << &txn << std::endl;
-
-//     return txn;
-// }
-
 }