added support for different topics/partitions

This commit is contained in:
accelerated
2018-04-30 20:11:25 -04:00
parent 15be627f8e
commit 71afaba3e1
2 changed files with 49 additions and 16 deletions

View File

@@ -26,9 +26,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#include "utils/roundrobin_poll_adapter.h"
using std::string;
using std::make_pair;
using std::chrono::milliseconds;
using std::make_move_iterator;
@@ -123,11 +125,19 @@ MessageList RoundRobinPollAdapter::poll_batch(size_t max_batch_size, millisecond
return messages;
}
size_t RoundRobinPollAdapter::get_num_partitions() {
return partition_queues_.ref().size();
}
void RoundRobinPollAdapter::on_assignment(TopicPartitionList& partitions) {
//populate partition queues
// populate partition queues
for (const auto& partition : partitions) {
partition_queues_.ref().push_back(consumer_.get_partition_queue(partition));
// get the queue associated with this partition
CircularBuffer::toppar_t key = make_pair(partition.get_topic(), partition.get_partition());
partition_queues_.ref().emplace(key, consumer_.get_partition_queue(partition));
}
// reset the queue iterator
partition_queues_.rewind();
// call original consumer callback if any
if (assignment_callback_) {
assignment_callback_(partitions);
@@ -135,10 +145,17 @@ void RoundRobinPollAdapter::on_assignment(TopicPartitionList& partitions) {
}
void RoundRobinPollAdapter::on_revocation(const TopicPartitionList& partitions) {
// put all partitions queues back to their initial state
restore_forwarding();
// empty the circular queue list
partition_queues_.ref().clear();
for (const auto& partition : partitions) {
// get the queue associated with this partition
CircularBuffer::toppar_t key = make_pair(partition.get_topic(), partition.get_partition());
auto qit = partition_queues_.ref().find(key);
if (qit != partition_queues_.ref().end()) {
// restore forwarding on this queue
qit->second.forward_to_queue(consumer_queue_);
// remove this queue from the list
partition_queues_.ref().erase(qit);
}
}
// reset the queue iterator
partition_queues_.rewind();
// call original consumer callback if any
@@ -148,6 +165,7 @@ void RoundRobinPollAdapter::on_revocation(const TopicPartitionList& partitions)
}
void RoundRobinPollAdapter::on_rebalance_error(Error error) {
// Todo : clear partition queues ?
// call original consumer callback if any
if (rebalance_error_callback_) {
rebalance_error_callback_(error);
@@ -156,8 +174,8 @@ void RoundRobinPollAdapter::on_rebalance_error(Error error) {
void RoundRobinPollAdapter::restore_forwarding() {
// forward all partition queues
for (const auto& queue : partition_queues_.ref()) {
queue.forward_to_queue(consumer_queue_);
for (const auto& toppar_queue : partition_queues_.ref()) {
toppar_queue.second.forward_to_queue(consumer_queue_);
}
}