From 0187542c00e14330f5b45e8358732eb1b65a428c Mon Sep 17 00:00:00 2001
From: Jia He <mofhejia@163.com>
Date: Thu, 11 Nov 2021 13:15:01 +0800
Subject: [PATCH] Fix misprocessing of "CLUSTER NODES" return

---
 .../kernels/redis_impl/redis_cluster_connection_pool.hpp    | 3 ++-
 .../core/kernels/redis_impl/redis_table_op_util.hpp         | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tensorflow_recommenders_addons/dynamic_embedding/core/kernels/redis_impl/redis_cluster_connection_pool.hpp b/tensorflow_recommenders_addons/dynamic_embedding/core/kernels/redis_impl/redis_cluster_connection_pool.hpp
index bab4c3462..40f04aa63 100644
--- a/tensorflow_recommenders_addons/dynamic_embedding/core/kernels/redis_impl/redis_cluster_connection_pool.hpp
+++ b/tensorflow_recommenders_addons/dynamic_embedding/core/kernels/redis_impl/redis_cluster_connection_pool.hpp
@@ -384,7 +384,8 @@ class RedisWrapper<RedisInstance, K, V,
       tmp_slot_num.reserve(4);
       unsigned tmp_first_slot = 0, tmp_second_slot = 0;
       for (auto row : csv_table) {
-        if (strcmp(row.at(2).data(), "master") == 0) {
+        if (strcmp(row.at(2).data(), "master") == 0 ||
+            strcmp(row.at(2).data(), "myself,master") == 0) {
           if (full_slots) {
             for (size_t i = 8; i < row.size(); ++i) {
               for (const char *num = row.at(i).data();
diff --git a/tensorflow_recommenders_addons/dynamic_embedding/core/kernels/redis_impl/redis_table_op_util.hpp b/tensorflow_recommenders_addons/dynamic_embedding/core/kernels/redis_impl/redis_table_op_util.hpp
index fc1654a50..99fb6c3b2 100644
--- a/tensorflow_recommenders_addons/dynamic_embedding/core/kernels/redis_impl/redis_table_op_util.hpp
+++ b/tensorflow_recommenders_addons/dynamic_embedding/core/kernels/redis_impl/redis_table_op_util.hpp
@@ -473,8 +473,10 @@ std::vector<std::string> BuildKeysPrefixNameSlices(
           }
         }
       } else {
-        LOG(WARNING) << "Nodes in Redis service is bigger than storage_slice "
-                        "set by user, it may cause data skew.";
+        if (cluster_slots.size() > storage_slice) {
+          LOG(WARNING) << "Nodes in Redis service is bigger than storage_slice "
+                          "set by user, it may cause data skew.";
+        }
         for (unsigned i = 0; i < storage_slice; ++i) {
           keys_prefix_name_slices.emplace_back(
               keys_prefix_name + '{' +