Revert "[core] Add source location to status" (#48517)

Reverts #48458
ray-project · Nov 2, 2024 · f6a5423 · f6a5423
1 parent e162165
commit f6a5423
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 150 deletions.
diff --git a/src/ray/common/BUILD b/src/ray/common/BUILD
@@ -1,4 +1,4 @@
-load("//bazel:ray.bzl", "ray_cc_library", "ray_cc_test")
+load("//bazel:ray.bzl", "ray_cc_library")
 
 ray_cc_library(
     name = "constants",
@@ -268,23 +268,5 @@ ray_cc_library(
     hdrs = ["status.h"],
     deps = [
         "//src/ray/util",
-        ":source_location",
-    ],
-)
-
-ray_cc_library(
-    name = "source_location",
-    srcs = ["source_location.cc"],
-    hdrs = ["source_location.h"],
-)
-
-ray_cc_test(
-    name = "source_location_test",
-    size = "small",
-    srcs = ["source_location_test.cc"],
-    tags = ["team:core"],
-    deps = [
-        ":source_location",
-        "@com_google_googletest//:gtest_main",
     ],
 )
diff --git a/src/ray/common/source_location.cc b/src/ray/common/source_location.cc
diff --git a/src/ray/common/source_location.h b/src/ray/common/source_location.h
diff --git a/src/ray/common/source_location_test.cc b/src/ray/common/source_location_test.cc
diff --git a/src/ray/common/status.cc b/src/ray/common/status.cc
@@ -28,9 +28,9 @@
 
 #include "ray/common/status.h"
 
+#include <assert.h>
+
 #include <boost/system/error_code.hpp>
-#include <cassert>
-#include <sstream>
 
 #include "absl/container/flat_hash_map.h"
 
@@ -119,18 +119,11 @@ const absl::flat_hash_map<std::string, StatusCode> kStrToCode = []() {
 
 }  // namespace
 
-Status::Status(StatusCode code, const std::string &msg, int rpc_code)
-    : Status(code, msg, SourceLocation{}, rpc_code) {}
-
-Status::Status(StatusCode code,
-               const std::string &msg,
-               SourceLocation loc,
-               int rpc_code) {
+Status::Status(StatusCode code, const std::string &msg, int rpc_code) {
   assert(code != StatusCode::OK);
   state_ = new State;
   state_->code = code;
   state_->msg = msg;
-  state_->loc = loc;
   state_->rpc_code = rpc_code;
 }
 
@@ -170,16 +163,8 @@ std::string Status::ToString() const {
   if (state_ == nullptr) {
     return result;
   }
-
   result += ": ";
   result += state_->msg;
-
-  if (IsValidSourceLoc(state_->loc)) {
-    std::stringstream ss;
-    ss << state_->loc;
-    result += " at ";
-    result += ss.str();
-  }
   return result;
 }
 

diff --git a/src/ray/common/status.h b/src/ray/common/status.h
@@ -32,7 +32,6 @@
 #include <iosfwd>
 #include <string>
 
-#include "ray/common/source_location.h"
 #include "ray/util/logging.h"
 #include "ray/util/macros.h"
 #include "ray/util/visibility.h"
@@ -125,7 +124,6 @@ class RAY_EXPORT Status {
   ~Status() { delete state_; }
 
   Status(StatusCode code, const std::string &msg, int rpc_code = -1);
-  Status(StatusCode code, const std::string &msg, SourceLocation loc, int rpc_code = -1);
 
   // Copy the specified status.
   Status(const Status &s);
@@ -327,7 +325,6 @@ class RAY_EXPORT Status {
   struct State {
     StatusCode code;
     std::string msg;
-    SourceLocation loc;
     // If code is RpcError, this contains the RPC error code
     int rpc_code;
   };