[gRPC] Migrate gcs data structures to protobuf (#5024)

python/ray/tests/cluster_utils.py

@@ -8,7 +8,7 @@ import time
 import redis
 
 import ray
-from ray.core.generated.EntryType import EntryType
+from ray.gcs_utils import ClientTableData
 
 logger = logging.getLogger(__name__)
 
@@ -177,7 +177,7 @@ class Cluster(object):
             clients = ray.state._parse_client_table(redis_client)
             live_clients = [
                 client for client in clients
-                if client["EntryType"] == EntryType.INSERTION
+                if client["EntryType"] == ClientTableData.INSERTION
             ]
 
             expected = len(self.list_all_nodes())

python/ray/tests/test_basic.py

@@ -2736,15 +2736,17 @@ def test_duplicate_error_messages(shutdown_only):
 
     r = ray.worker.global_worker.redis_client
 
-    r.execute_command("RAY.TABLE_APPEND", ray.gcs_utils.TablePrefix.ERROR_INFO,
-                      ray.gcs_utils.TablePubsub.ERROR_INFO, driver_id.binary(),
-                      error_data)
+    r.execute_command("RAY.TABLE_APPEND",
+                      ray.gcs_utils.TablePrefix.Value("ERROR_INFO"),
+                      ray.gcs_utils.TablePubsub.Value("ERROR_INFO_PUBSUB"),
+                      driver_id.binary(), error_data)
 
     # Before https://github.com/ray-project/ray/pull/3316 this would
     # give an error
-    r.execute_command("RAY.TABLE_APPEND", ray.gcs_utils.TablePrefix.ERROR_INFO,
-                      ray.gcs_utils.TablePubsub.ERROR_INFO, driver_id.binary(),
-                      error_data)
+    r.execute_command("RAY.TABLE_APPEND",
+                      ray.gcs_utils.TablePrefix.Value("ERROR_INFO"),
+                      ray.gcs_utils.TablePubsub.Value("ERROR_INFO_PUBSUB"),
+                      driver_id.binary(), error_data)
 
 
 @pytest.mark.skipif(

python/ray/tests/test_failure.py

@@ -493,8 +493,9 @@ def test_warning_monitor_died(shutdown_only):
     malformed_message = "asdf"
     redis_client = ray.worker.global_worker.redis_client
     redis_client.execute_command(
-        "RAY.TABLE_ADD", ray.gcs_utils.TablePrefix.HEARTBEAT_BATCH,
-        ray.gcs_utils.TablePubsub.HEARTBEAT_BATCH, fake_id, malformed_message)
+        "RAY.TABLE_ADD", ray.gcs_utils.TablePrefix.Value("HEARTBEAT_BATCH"),
+        ray.gcs_utils.TablePubsub.Value("HEARTBEAT_BATCH_PUBSUB"), fake_id,
+        malformed_message)
 
     wait_for_errors(ray_constants.MONITOR_DIED_ERROR, 1)