From 9e43ceb418f0c0ac902fa6bab0aa364f5a3a46a8 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Sat, 15 Jan 2022 06:37:29 +0000
Subject: [PATCH] Revert "[TableBase] Make channel name from both table name
 and database ID (#568)"

This reverts commit bd4d0ce356e0612d3142f6525037d7efe2266b2a.
---
 common/consumerstatetable.cpp |  2 +-
 common/consumertable.cpp      |  2 +-
 common/producerstatetable.cpp |  6 +++---
 common/producertable.cpp      |  2 +-
 common/table.h                | 12 ------------
 5 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/common/consumerstatetable.cpp b/common/consumerstatetable.cpp
index 40bc9d71e..54c753deb 100644
--- a/common/consumerstatetable.cpp
+++ b/common/consumerstatetable.cpp
@@ -24,7 +24,7 @@ ConsumerStateTable::ConsumerStateTable(DBConnector *db, const std::string &table
         watch.checkStatusOK();
         multi();
         enqueue(std::string("SCARD ") + getKeySetName(), REDIS_REPLY_INTEGER);
-        subscribe(m_db, getChannelName(m_db->getDbId()));
+        subscribe(m_db, getChannelName());
         bool succ = exec();
         if (succ) break;
     }
diff --git a/common/consumertable.cpp b/common/consumertable.cpp
index 18814af3b..fa340f88f 100644
--- a/common/consumertable.cpp
+++ b/common/consumertable.cpp
@@ -28,7 +28,7 @@ ConsumerTable::ConsumerTable(DBConnector *db, const string &tableName, int popBa
         watch.checkStatusOK();
         multi();
         enqueue(string("LLEN ") + getKeyValueOpQueueTableName(), REDIS_REPLY_INTEGER);
-        subscribe(m_db, getChannelName(m_db->getDbId()));
+        subscribe(m_db, getChannelName());
         enqueue(string("LLEN ") + getKeyValueOpQueueTableName(), REDIS_REPLY_INTEGER);
         bool succ = exec();
         if (succ) break;
diff --git a/common/producerstatetable.cpp b/common/producerstatetable.cpp
index 8c0b38b20..1c23930fc 100644
--- a/common/producerstatetable.cpp
+++ b/common/producerstatetable.cpp
@@ -92,7 +92,7 @@ void ProducerStateTable::set(const string &key, const vector<FieldValueTuple> &v
     args.emplace_back("EVALSHA");
     args.emplace_back(m_shaSet);
     args.emplace_back(to_string(values.size() + 2));
-    args.emplace_back(getChannelName(m_pipe->getDbId()));
+    args.emplace_back(getChannelName());
     args.emplace_back(getKeySetName());
 
     args.insert(args.end(), values.size(), getStateHashPrefix() + getKeyName(key));
@@ -133,7 +133,7 @@ void ProducerStateTable::del(const string &key, const string &op /*= DEL_COMMAND
     args.emplace_back("EVALSHA");
     args.emplace_back(m_shaDel);
     args.emplace_back("4");
-    args.emplace_back(getChannelName(m_pipe->getDbId()));
+    args.emplace_back(getChannelName());
     args.emplace_back(getKeySetName());
     args.emplace_back(getStateHashPrefix() + getKeyName(key));
     args.emplace_back(getDelKeySetName());
@@ -307,7 +307,7 @@ void ProducerStateTable::apply_temp_view()
     args.emplace_back("EVALSHA");
     args.emplace_back(m_shaApplyView);
     args.emplace_back(to_string(m_tempViewState.size() + 3));
-    args.emplace_back(getChannelName(m_pipe->getDbId()));
+    args.emplace_back(getChannelName());
     args.emplace_back(getKeySetName());
     args.emplace_back(getDelKeySetName());
 
diff --git a/common/producertable.cpp b/common/producertable.cpp
index 133a07987..24d0e8cea 100644
--- a/common/producertable.cpp
+++ b/common/producertable.cpp
@@ -73,7 +73,7 @@ void ProducerTable::enqueueDbChange(const string &key, const string &value, cons
         "EVALSHA %s 2 %s %s %s %s %s %s",
         m_shaEnque.c_str(),
         getKeyValueOpQueueTableName().c_str(),
-        getChannelName(m_pipe->getDbId()).c_str(),
+        getChannelName().c_str(),
         key.c_str(),
         value.c_str(),
         op.c_str(),
diff --git a/common/table.h b/common/table.h
index 04f25ee0e..6dcc12000 100644
--- a/common/table.h
+++ b/common/table.h
@@ -78,18 +78,6 @@ class TableBase {
     }
 
     std::string getChannelName() { return m_tableName + "_CHANNEL"; }
-
-    /* Return tagged channel name */
-    std::string getChannelName(const std::string &tag)
-    {
-        return m_tableName + "_CHANNEL" + "@" + tag;
-    }
-
-    /* Return tagged channel name, most likely tag number could be dbId */
-    std::string getChannelName(int tag)
-    {
-        return getChannelName(std::to_string(tag));
-    }
 private:
     static const std::string TABLE_NAME_SEPARATOR_COLON;
     static const std::string TABLE_NAME_SEPARATOR_VBAR;