streaming: Get rid of the stream_index

It is always zero.

streaming/progress_info.cc

@@ -42,8 +42,8 @@ namespace streaming {
 
 std::ostream& operator<<(std::ostream& os, const progress_info& x) {
     sstring dir = x.dir == progress_info::direction::OUT ? "sent to " : "received from ";
-    return os << sprint("%s %ld/(%f\%) %s idx:%d %s", x.file_name, x.current_bytes,
-            x.current_bytes * 100 / x.total_bytes, dir, x.session_index, x.peer);
+    return os << sprint("%s %ld/(%f\%) %s %s", x.file_name, x.current_bytes,
+            x.current_bytes * 100 / x.total_bytes, dir, x.peer);
 }
 
 }

streaming/progress_info.hh

@@ -55,16 +55,14 @@ public:
     enum class direction { OUT, IN };
 
     inet_address peer;
-    int session_index;
     sstring file_name;
     direction dir;
     long current_bytes;
     long total_bytes;
 
     progress_info() = default;
-    progress_info(inet_address _peer, int _session_index, sstring _file_name, direction _dir, long _current_bytes, long _total_bytes)
+    progress_info(inet_address _peer, sstring _file_name, direction _dir, long _current_bytes, long _total_bytes)
         : peer(_peer)
-        , session_index(_session_index)
         , file_name(_file_name)
         , dir(_dir)
         , current_bytes(_current_bytes)

streaming/session_info.hh

@@ -54,7 +54,6 @@ class session_info {
 public:
     using inet_address = gms::inet_address;
     inet_address peer;
-    int session_index;
     /** Immutable collection of receiving summaries */
     std::vector<stream_summary> receiving_summaries;
     /** Immutable collection of sending summaries*/
@@ -66,7 +65,7 @@ public:
     std::map<sstring, progress_info> sending_files;
 
     session_info() = default;
-    session_info(inet_address peer_, int session_index_,
+    session_info(inet_address peer_,
                  std::vector<stream_summary> receiving_summaries_,
                  std::vector<stream_summary> sending_summaries_,
                  stream_session_state state_)

streaming/stream_event.hh

@@ -68,13 +68,11 @@ struct session_complete_event : public stream_event {
     using inet_address = gms::inet_address;
     inet_address peer;
     bool success;
-    int session_index;
 
     session_complete_event(shared_ptr<stream_session> session)
         : stream_event(stream_event::type::STREAM_COMPLETE, session->plan_id())
         , peer(session->peer)
-        , success(session->is_success())
-        , session_index(session->session_index()) {
+        , success(session->is_success()) {
     }
 };
 

streaming/stream_session.cc

@@ -388,7 +388,7 @@ void stream_session::file_sent(const messages::file_message_header& header) {
 }
 
 void stream_session::progress(/* Descriptor desc */ progress_info::direction dir, long bytes, long total) {
-    auto progress = progress_info(peer, _index, "", dir, bytes, total);
+    auto progress = progress_info(peer, "", dir, bytes, total);
     _stream_result->handle_progress(std::move(progress));
 }
 
@@ -431,7 +431,7 @@ session_info stream_session::get_session_info() {
     for (auto& transfer : _transfers) {
         transfer_summaries.emplace_back(transfer.second.get_summary());
     }
-    return session_info(peer, _index, std::move(receiving_summaries), std::move(transfer_summaries), _state);
+    return session_info(peer, std::move(receiving_summaries), std::move(transfer_summaries), _state);
 }
 
 void stream_session::receive_task_completed(UUID cf_id) {

streaming/stream_session.hh

@@ -156,7 +156,6 @@ public:
     inet_address peer;
     unsigned dst_cpu_id;
 private:
-    int _index;
     // should not be null when session is started
     shared_ptr<stream_result_future> _stream_result;
 
@@ -198,10 +197,6 @@ public:
 
     UUID plan_id();
 
-    int session_index() {
-        return _index;
-    }
-
     sstring description();
 
 public: