Make pops public interface of ConsumerTable

sonic-net · Sep 18, 2017 · 9d8fa4b · 9d8fa4b
1 parent d4adb72
commit 9d8fa4b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/common/consumerstatetable.h b/common/consumerstatetable.h
@@ -20,11 +20,11 @@ class ConsumerStateTable : public RedisTransactioner, public RedisSelect, public
     /* If there is nothing to pop, the output paramter will have empty key and op */
     void pop(KeyOpFieldsValuesTuple &kco, std::string prefix = EMPTY_PREFIX);
 
-private:
-    std::deque<KeyOpFieldsValuesTuple> m_buffer;
-
     /* Get multiple pop elements */
     void pops(std::deque<KeyOpFieldsValuesTuple> &vkco, std::string prefix = EMPTY_PREFIX);
+
+private:
+    std::deque<KeyOpFieldsValuesTuple> m_buffer;
 };
 
 }
diff --git a/common/consumertable.h b/common/consumertable.h
@@ -22,11 +22,10 @@ class ConsumerTable : public RedisTransactioner, public RedisSelect, public Tabl
     /* Get a singlesubscribe channel rpop */
     void pop(KeyOpFieldsValuesTuple &kco, std::string prefix = EMPTY_PREFIX);
 
-private:
-    std::deque<KeyOpFieldsValuesTuple> m_buffer;
-
     /* Get multiple pop elements */
     void pops(std::deque<KeyOpFieldsValuesTuple> &vkco, std::string prefix = EMPTY_PREFIX);
+private:
+    std::deque<KeyOpFieldsValuesTuple> m_buffer;
 };
 
 }

diff --git a/common/table.h b/common/table.h
@@ -6,6 +6,7 @@
 #include <queue>
 #include <tuple>
 #include <map>
+#include <deque>
 #include "hiredis/hiredis.h"
 #include "dbconnector.h"
 #include "redisreply.h"
@@ -68,6 +69,9 @@ class TableEntryPoppable {
 
     /* Pop an action (set or del) on the table */
     virtual void pop(KeyOpFieldsValuesTuple &kco, std::string prefix = EMPTY_PREFIX) = 0;
+
+    /* Get multiple pop elements */
+    virtual void pops(std::deque<KeyOpFieldsValuesTuple> &vkco, std::string prefix = EMPTY_PREFIX) = 0;
 };
 
 class TableEntryEnumerable {