[ID Refactor] Rename DriverID to JobID (#5004)

* WIP WIP WIP Rename Driver -> Job Fix complition Fix Rename in Java In py WIP Fix WIP Fix Fix test Fix Fix C++ linting Fix * Update java/runtime/src/main/java/org/ray/runtime/config/RayConfig.java Co-Authored-By: Stephanie Wang <swang@cs.berkeley.edu> * Update src/ray/core_worker/core_worker.cc Co-Authored-By: Stephanie Wang <swang@cs.berkeley.edu> * Address comments * Fix * Fix CI * Fix cpp linting * Fix py lint * FIx * Address comments and fix * Address comments * Address * Fix import_threading
2026-07-08 00:34:37 +08:00 · 2019-06-28 00:44:51 +08:00
parent d9768c1cd2
commit 62e4b591e3
79 changed files with 961 additions and 974 deletions
@@ -6,7 +6,8 @@ from libcpp.unordered_map cimport unordered_map
 from libcpp.vector cimport vector as c_vector

 from ray.includes.unique_ids cimport (
-    CDriverID,
+    CJobID,
+    CWorkerID,
    CObjectID,
    CTaskID,
 )
@@ -81,7 +82,7 @@ cdef extern from "ray/common/status.h" namespace "ray::StatusCode" nogil:


 cdef extern from "ray/common/id.h" namespace "ray" nogil:
-    const CTaskID GenerateTaskId(const CDriverID &driver_id,
+    const CTaskID GenerateTaskId(const CJobID &job_id,
                                 const CTaskID &parent_task_id,
                                 int parent_task_counter)

@@ -14,7 +14,8 @@ from ray.includes.unique_ids cimport (
    CActorCheckpointID,
    CActorID,
    CClientID,
-    CDriverID,
+    CJobID,
+    CWorkerID,
    CObjectID,
    CTaskID,
 )
@@ -46,7 +47,7 @@ cdef extern from "ray/raylet/raylet_client.h" nogil:
    cdef cppclass CRayletClient "RayletClient":
        CRayletClient(const c_string &raylet_socket,
                      const CClientID &client_id,
-                      c_bool is_worker, const CDriverID &driver_id,
+                      c_bool is_worker, const CJobID &job_id,
                      const CLanguage &language)
        CRayStatus Disconnect()
        CRayStatus SubmitTask(
@@ -62,7 +63,7 @@ cdef extern from "ray/raylet/raylet_client.h" nogil:
                        int num_returns, int64_t timeout_milliseconds,
                        c_bool wait_local, const CTaskID &current_task_id,
                        WaitResultPair *result)
-        CRayStatus PushError(const CDriverID &driver_id, const c_string &type,
+        CRayStatus PushError(const CJobID &job_id, const c_string &type,
                             const c_string &error_message, double timestamp)
        CRayStatus PushProfileEvents(
            const GCSProfileTableDataT &profile_events)
@@ -75,6 +76,6 @@ cdef extern from "ray/raylet/raylet_client.h" nogil:
        CRayStatus SetResource(const c_string &resource_name, const double capacity, const CClientID &client_Id)
        CLanguage GetLanguage() const
        CClientID GetClientID() const
-        CDriverID GetDriverID() const
+        CJobID GetJobID() const
        c_bool IsWorker() const
        const ResourceMappingType &GetResourceIDs() const
@@ -12,7 +12,7 @@ from ray.includes.common cimport (
 from ray.includes.unique_ids cimport (
    CActorHandleID,
    CActorID,
-    CDriverID,
+    CJobID,
    CObjectID,
    CTaskID,
 )
@@ -46,7 +46,7 @@ cdef extern from "ray/raylet/task_spec.h" namespace "ray::raylet" nogil:

    cdef cppclass CTaskSpecification "ray::raylet::TaskSpecification":
        CTaskSpecification(
-            const CDriverID &driver_id, const CTaskID &parent_task_id,
+            const CJobID &job_id, const CTaskID &parent_task_id,
            int64_t parent_counter,
            const c_vector[shared_ptr[CTaskArgument]] &task_arguments,
            int64_t num_returns,
@@ -54,7 +54,7 @@ cdef extern from "ray/raylet/task_spec.h" namespace "ray::raylet" nogil:
            const CLanguage &language,
            const c_vector[c_string] &function_descriptor)
        CTaskSpecification(
-            const CDriverID &driver_id, const CTaskID &parent_task_id,
+            const CJobID &job_id, const CTaskID &parent_task_id,
            int64_t parent_counter, const CActorID &actor_creation_id,
            const CObjectID &actor_creation_dummy_object_id,
            int64_t max_actor_reconstructions, const CActorID &actor_id,
@@ -70,7 +70,7 @@ cdef extern from "ray/raylet/task_spec.h" namespace "ray::raylet" nogil:
        c_string SerializeAsString() const

        CTaskID TaskId() const
-        CDriverID DriverId() const
+        CJobID JobId() const
        CTaskID ParentTaskId() const
        int64_t ParentCounter() const
        c_vector[c_string] FunctionDescriptor() const
@@ -18,7 +18,7 @@ cdef class Task:
        unique_ptr[CTaskSpecification] task_spec
        unique_ptr[c_vector[CObjectID]] execution_dependencies

-    def __init__(self, DriverID driver_id, function_descriptor, arguments,
+    def __init__(self, JobID job_id, function_descriptor, arguments,
                 int num_returns, TaskID parent_task_id, int parent_counter,
                 ActorID actor_creation_id,
                 ObjectID actor_creation_dummy_object_id,
@@ -72,7 +72,7 @@ cdef class Task:
                (<ActorHandleID?>new_actor_handle).native())

        self.task_spec.reset(new CTaskSpecification(
-            driver_id.native(), parent_task_id.native(), parent_counter, actor_creation_id.native(),
+            job_id.native(), parent_task_id.native(), parent_counter, actor_creation_id.native(),
            actor_creation_dummy_object_id.native(), max_actor_reconstructions, actor_id.native(),
            actor_handle_id.native(), actor_counter, task_new_actor_handles, task_args, num_returns,
            required_resources, required_placement_resources, LANGUAGE_PYTHON,
@@ -122,9 +122,9 @@ cdef class Task:
        return SerializeTaskAsString(
            self.execution_dependencies.get(), self.task_spec.get())

-    def driver_id(self):
-        """Return the driver ID for this task."""
-        return DriverID(self.task_spec.get().DriverId().Binary())
+    def job_id(self):
+        """Return the job ID for this task."""
+        return JobID(self.task_spec.get().JobId().Binary())

    def task_id(self):
        """Return the task ID for this task."""
@@ -78,10 +78,10 @@ cdef extern from "ray/common/id.h" namespace "ray" nogil:
        @staticmethod
        CFunctionID FromBinary(const c_string &binary)

-    cdef cppclass CDriverID "ray::DriverID"(CUniqueID):
+    cdef cppclass CJobID "ray::JobID"(CUniqueID):

        @staticmethod
-        CDriverID FromBinary(const c_string &binary)
+        CJobID FromBinary(const c_string &binary)

    cdef cppclass CTaskID "ray::TaskID"(CBaseID[CTaskID]):

@@ -15,7 +15,7 @@ from ray.includes.unique_ids cimport (
    CActorID,
    CClientID,
    CConfigID,
-    CDriverID,
+    CJobID,
    CFunctionID,
    CObjectID,
    CTaskID,
@@ -212,15 +212,23 @@ cdef class ClientID(UniqueID):
        return <CClientID>self.data


-cdef class DriverID(UniqueID):
+cdef class JobID(UniqueID):

    def __init__(self, id):
        check_id(id)
-        self.data = CDriverID.FromBinary(<c_string>id)
+        self.data = CJobID.FromBinary(<c_string>id)

-    cdef CDriverID native(self):
-        return <CDriverID>self.data
+    cdef CJobID native(self):
+        return <CJobID>self.data

+cdef class WorkerID(UniqueID):
+
+    def __init__(self, id):
+        check_id(id)
+        self.data = CWorkerID.FromBinary(<c_string>id)
+
+    cdef CWorkerID native(self):
+        return <CWorkerID>self.data

 cdef class ActorID(UniqueID):

@@ -277,7 +285,8 @@ _ID_TYPES = [
    ActorHandleID,
    ActorID,
    ClientID,
-    DriverID,
+    JobID,
+    WorkerID,
    FunctionID,
    ObjectID,
    TaskID,