Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core] Small optimizations from accelerated DAG experiment #41418

Merged
merged 12 commits into from
Nov 30, 2023
Merged

[core] Small optimizations from accelerated DAG experiment #41418

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a983e06
point optimizations
ericl Nov 27, 2023
979c858
revert bytes check
ericl Nov 27, 2023
5d31c89
comments
ericl Nov 28, 2023
53a8d8a
fix comment
ericl Nov 29, 2023
dbd2a33
fix segfault
ericl Nov 29, 2023
18f68f6
Merge remote-tracking branch 'upstream/master' into misc-opt
ericl Nov 29, 2023
a019d22
switch to static const
ericl Nov 29, 2023
53cfcbb
revert auto init hook
ericl Nov 30, 2023
e818378
clear job id on shutdown
ericl Nov 30, 2023
67c06c9
Revert "revert auto init hook"
ericl Nov 30, 2023
fb44860
add back auto connect for test
ericl Nov 30, 2023
922ec8f
fix
ericl Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
switch to static const 
Signed-off-by: Eric Liang <ekhliang@gmail.com>
  • Loading branch information
@ericl
ericl committed Nov 29, 2023
commit a019d22af09e0425adf2491dcdfc001b49b9b3b7
12 changes: 6 additions & 6 deletions src/ray/common/ray_object.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
#include "msgpack.hpp"

namespace {

static const std::string kObjectInPlasmaStr =
std::to_string(ray::rpc::ErrorType::OBJECT_IN_PLASMA);

std::shared_ptr<ray::LocalMemoryBuffer> MakeBufferFromString(const uint8_t *data,
size_t data_size) {
auto metadata = const_cast<uint8_t *>(data);
Expand Down Expand Up @@ -110,9 +114,7 @@ bool RayObject::IsException(rpc::ErrorType *error_type) const {
// TODO (kfstorm): metadata should be structured.
const std::string_view metadata(reinterpret_cast<const char *>(metadata_->Data()),
metadata_->Size());
// Keep in sync with common.proto.
static_assert(ray::rpc::ErrorType::OBJECT_IN_PLASMA == 4);
if (metadata == "4") {
if (metadata == kObjectInPlasmaStr) {
if (error_type) {
*error_type = rpc::ErrorType::OBJECT_IN_PLASMA;
}
Expand All @@ -137,9 +139,7 @@ bool RayObject::IsInPlasmaError() const {
}
const std::string_view metadata(reinterpret_cast<const char *>(metadata_->Data()),
metadata_->Size());
// Keep in sync with common.proto.
static_assert(ray::rpc::ErrorType::OBJECT_IN_PLASMA == 4);
return metadata == "4";
return metadata == kObjectInPlasmaStr;
}

} // namespace ray