Revert "Warm reboot: Add support for bool Select::hasCachedSelectable() (sonic-net#214)"

This reverts commit c5d5434.

Author: qiluo-msft

common/select.cpp

@@ -162,10 +162,5 @@ int Select::select(Selectable **c, int timeout)
 
 }
 
-bool Select::isQueueEmpty()
-{
-    return m_ready.empty();
-}
-
 };
 

common/select.h

@@ -33,7 +33,7 @@ class Select
     };
 
     int select(Selectable **c, int timeout = -1);
-    bool isQueueEmpty();
+
 private:
     struct cmp
     {

tests/redis_subscriber_state_ut.cpp

@@ -21,7 +21,6 @@ using namespace swss;
 static const string dbhost = "localhost";
 static const int dbport = 6379;
 static const string testTableName = "UT_REDIS_TABLE";
-static const string testTableName2 = "UT_REDIS_TABLE2";
 
 static inline int getMaxFields(int i)
 {
@@ -431,92 +430,3 @@ TEST(SubscriberStateTable, one_producer_multiple_subscriber)
     }
     cout << endl << "Done." << endl;
 }
-
-TEST(SubscriberStateTable, cachedData)
-{
-    clearDB();
-
-    /* Prepare init data */
-    int index = 0;
-    int maxNumOfFields = 2;
-
-    DBConnector db(TEST_DB, dbhost, dbport, 0);
-    Table p(&db, testTableName);
-    string key1 = "TheKey1";
-    /* Set operation */
-    {
-        vector<FieldValueTuple> fields;
-        for (int j = 0; j < maxNumOfFields; j++)
-        {
-            FieldValueTuple t(field(index, j), value(index, j));
-            fields.push_back(t);
-        }
-        p.set(key1, fields);
-    }
-
-    Table p2(&db, testTableName2);
-    string key2 = "TheKey2";
-    /* Set operation */
-    {
-        vector<FieldValueTuple> fields;
-        for (int j = 0; j < maxNumOfFields; j++)
-        {
-            FieldValueTuple t(field(index, j), value(index, j));
-            fields.push_back(t);
-        }
-        p2.set(key2, fields);
-    }
-
-    /* Prepare subscriber */
-    SubscriberStateTable c1(&db, testTableName);
-    SubscriberStateTable c2(&db, testTableName2);
-    Select cs;
-    Selectable *selectcs;
-    cs.addSelectable(&c1);
-    cs.addSelectable(&c2);
-
-    /* Pop operation and check CachedSelectable */
-    {
-        string key = key1;
-        int ret = cs.select(&selectcs);
-        EXPECT_EQ(ret, Select::OBJECT);
-        KeyOpFieldsValuesTuple kco;
-        if (selectcs == &c1)
-        {
-            c1.pop(kco);
-        }
-        else
-        {
-            c2.pop(kco);
-            key = key2;
-        }
-
-        EXPECT_EQ(kfvKey(kco), key);
-        EXPECT_EQ(kfvOp(kco), "SET");
-
-        /* There is one cached selectable left */
-        bool r = cs.isQueueEmpty();
-        EXPECT_FALSE(r);
-
-        ret = cs.select(&selectcs);
-        EXPECT_EQ(ret, Select::OBJECT);
-        if (key == key1)
-        {
-            EXPECT_TRUE(selectcs == &c2);
-            key = key2;
-            c2.pop(kco);
-        }
-        else
-        {
-            EXPECT_TRUE(selectcs == &c1);
-            key = key1;
-            c1.pop(kco);
-        }
-
-        EXPECT_EQ(kfvKey(kco), key);
-        EXPECT_EQ(kfvOp(kco), "SET");
-        /* No cached selectable left */
-        r = cs.isQueueEmpty();
-        EXPECT_TRUE(r);
-    }
-}