From 4955d14878848aede7612ad7b8636ca18271d14a Mon Sep 17 00:00:00 2001 From: Edward Oakes Date: Fri, 29 May 2020 15:47:08 -0500 Subject: [PATCH] Remove transport type remnants (#8673) --- src/ray/common/id.cc | 9 --------- src/ray/design_docs/id_specification.md | 12 +++++------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/ray/common/id.cc b/src/ray/common/id.cc index 1020ac83c..22939a21e 100644 --- a/src/ray/common/id.cc +++ b/src/ray/common/id.cc @@ -60,10 +60,6 @@ constexpr uint8_t kCreatedByTaskBitsOffset = 15; /// The bit offset of the flag `ObjectType` in a flags bytes. constexpr uint8_t kObjectTypeBitsOffset = 14; -/// The bit offset of the flag `TransportType` in a flags bytes. -// TODO(edoakes): this isn't used anymore, should update ID layout. -// constexpr uint8_t kTransportTypeBitsOffset = 11; - /// The mask that is used to mask the flag `CreatedByTask`. constexpr ObjectIDFlagsType kCreatedByTaskFlagBitMask = 0x1 << kCreatedByTaskBitsOffset; @@ -71,11 +67,6 @@ constexpr ObjectIDFlagsType kCreatedByTaskFlagBitMask = 0x1 << kCreatedByTaskBit /// So it can represent for 2 types. constexpr ObjectIDFlagsType kObjectTypeFlagBitMask = 0x1 << kObjectTypeBitsOffset; -/// The mask that is used to mask 3 bits to indicate the type of transport. -// TODO(edoakes): this isn't used anymore, should update ID layout. -// constexpr ObjectIDFlagsType kTransportTypeFlagBitMask = 0x7 << -// kTransportTypeBitsOffset; - /// The implementations of helper functions. inline void SetCreatedByTaskFlag(bool created_by_task, ObjectIDFlagsType *flags) { const ObjectIDFlagsType object_type_bits = diff --git a/src/ray/design_docs/id_specification.md b/src/ray/design_docs/id_specification.md index a07fec7c4..c7b760644 100644 --- a/src/ray/design_docs/id_specification.md +++ b/src/ray/design_docs/id_specification.md @@ -56,10 +56,10 @@ An `ObjectID` contains 3 parts: **flags bytes format** ``` - 1b 1b 3b 11b -+-------------------------------------------------------------------------+ -| (1) | (2) | (3) | (4)unused | -+-------------------------------------------------------------------------+ + 1b 1b 14b ++-------------------------------------------------------+ +| (1) | (2) | (4)unused | ++-------------------------------------------------------+ ``` - The (1) `created_by_task` part is one bit to indicate whether this `ObjectID` is generated (put or returned) from a task. @@ -67,6 +67,4 @@ An `ObjectID` contains 3 parts: - `PUT_OBJECT` indicates this object is generated through `ray.put` during the task's execution. - `RETURN_OBJECT` indicates this object is the return value of a task. -- The (3) `transport_type` part is 3 bits to indicate the type of the transport which is used to transfer this object. So it can support 8 types. - -- There are 11 bits unused in `flags bytes`. +- There are 14 bits unused in `flags bytes`.