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

Jump to bottom

Replace usages of the tsl::Status constructor to prepare for the absl::Status migration. #1780

Merged
merged 2 commits into from
Jul 4, 2023
Merged

Replace usages of the tsl::Status constructor to prepare for the absl::Status migration. #1780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db637ad
Replace usages of the tsl::Status constructor to prepare for the absl…
jblespiau Mar 13, 2023
dad910d
Merge branch 'master' into master
yongtang Jul 3, 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
42 changes: 22 additions & 20 deletions tensorflow_io/core/kernels/bigquery/bigquery_lib.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,43 +17,43 @@

namespace tensorflow {
namespace {
::tensorflow::error::Code GcpErrorCodeToTfErrorCode(::grpc::StatusCode code) {
absl::StatusCode GcpErrorCodeToTfErrorCode(::grpc::StatusCode code) {
switch (code) {
case ::grpc::StatusCode::OK:
return ::tensorflow::error::OK;
return absl::StatusCode::kOk;
case ::grpc::StatusCode::CANCELLED:
return ::tensorflow::error::CANCELLED;
return absl::StatusCode::kCancelled;
case ::grpc::StatusCode::INVALID_ARGUMENT:
return ::tensorflow::error::INVALID_ARGUMENT;
return absl::StatusCode::kInvalidArgument;
case ::grpc::StatusCode::DEADLINE_EXCEEDED:
return ::tensorflow::error::DEADLINE_EXCEEDED;
return absl::StatusCode::kDeadlineExceeded;
case ::grpc::StatusCode::NOT_FOUND:
return ::tensorflow::error::NOT_FOUND;
return absl::StatusCode::kNotFound;
case ::grpc::StatusCode::ALREADY_EXISTS:
return ::tensorflow::error::ALREADY_EXISTS;
return absl::StatusCode::kAlreadyExists;
case ::grpc::StatusCode::PERMISSION_DENIED:
return ::tensorflow::error::PERMISSION_DENIED;
return absl::StatusCode::kPermissionDenied;
case ::grpc::StatusCode::UNAUTHENTICATED:
return ::tensorflow::error::UNAUTHENTICATED;
return absl::StatusCode::kUnauthenticated;
case ::grpc::StatusCode::RESOURCE_EXHAUSTED:
return ::tensorflow::error::RESOURCE_EXHAUSTED;
return absl::StatusCode::kResourceExhausted;
case ::grpc::StatusCode::FAILED_PRECONDITION:
return ::tensorflow::error::FAILED_PRECONDITION;
return absl::StatusCode::kFailedPrecondition;
case ::grpc::StatusCode::ABORTED:
return ::tensorflow::error::ABORTED;
return absl::StatusCode::kAborted;
case ::grpc::StatusCode::OUT_OF_RANGE:
return ::tensorflow::error::OUT_OF_RANGE;
return absl::StatusCode::kOutOfRange;
case ::grpc::StatusCode::UNIMPLEMENTED:
return ::tensorflow::error::UNIMPLEMENTED;
return absl::StatusCode::kUnimplemented;
case ::grpc::StatusCode::INTERNAL:
return ::tensorflow::error::INTERNAL;
return absl::StatusCode::kInternal;
case ::grpc::StatusCode::UNAVAILABLE:
return ::tensorflow::error::UNAVAILABLE;
return absl::StatusCode::kUnavailable;
case ::grpc::StatusCode::DATA_LOSS:
return ::tensorflow::error::DATA_LOSS;
return absl::StatusCode::kDataLoss;
case ::grpc::StatusCode::UNKNOWN: // Fallthrough
default:
return ::tensorflow::error::UNKNOWN;
return absl::StatusCode::kUnknown;
}
}
} // namespace
Expand All @@ -62,7 +62,8 @@
if (status.ok()) {
return OkStatus();
}
return Status(GcpErrorCodeToTfErrorCode(status.error_code()),
return Status(static_cast<tensorflow::errors::Code>(
GcpErrorCodeToTfErrorCode(status.error_code())),

Check warning on line 66 in tensorflow_io/core/kernels/bigquery/bigquery_lib.cc

View workflow job for this annotation

GitHub Actions / Clang Format 

[reviewdog-suggester] reported by reviewdog 🐶


Raw Output:
tensorflow_io/core/kernels/bigquery/bigquery_lib.cc:66:-                GcpErrorCodeToTfErrorCode(status.error_code())),
tensorflow_io/core/kernels/bigquery/bigquery_lib.cc:66:+                    GcpErrorCodeToTfErrorCode(status.error_code())),
strings::StrCat("Error reading from Cloud BigQuery: ",
status.error_message()));
}
Expand All @@ -71,9 +72,10 @@
if (status.ok()) {
return "OK";
}
return strings::StrCat("Status code: ",

Check warning on line 75 in tensorflow_io/core/kernels/bigquery/bigquery_lib.cc

View workflow job for this annotation

GitHub Actions / Clang Format 

[reviewdog-suggester] reported by reviewdog 🐶


Raw Output:
tensorflow_io/core/kernels/bigquery/bigquery_lib.cc:75:-  return strings::StrCat("Status code: ",
tensorflow_io/core/kernels/bigquery/bigquery_lib.cc:76:-                         ::tensorflow::error::Code_Name(
tensorflow_io/core/kernels/bigquery/bigquery_lib.cc:77:-                             static_cast<tensorflow::error::Code>(
tensorflow_io/core/kernels/bigquery/bigquery_lib.cc:78:-                             GcpErrorCodeToTfErrorCode(status.error_code()))),
tensorflow_io/core/kernels/bigquery/bigquery_lib.cc:79:-                         " error message:", status.error_message(),
tensorflow_io/core/kernels/bigquery/bigquery_lib.cc:80:-                         " error details: ", status.error_details());
tensorflow_io/core/kernels/bigquery/bigquery_lib.cc:75:+  return strings::StrCat(
tensorflow_io/core/kernels/bigquery/bigquery_lib.cc:76:+      "Status code: ",
tensorflow_io/core/kernels/bigquery/bigquery_lib.cc:77:+      ::tensorflow::error::Code_Name(static_cast<tensorflow::error::Code>(
tensorflow_io/core/kernels/bigquery/bigquery_lib.cc:78:+          GcpErrorCodeToTfErrorCode(status.error_code()))),
tensorflow_io/core/kernels/bigquery/bigquery_lib.cc:79:+      " error message:", status.error_message(),
tensorflow_io/core/kernels/bigquery/bigquery_lib.cc:80:+      " error details: ", status.error_details());
::tensorflow::error::Code_Name(
GcpErrorCodeToTfErrorCode(status.error_code())),
static_cast<tensorflow::error::Code>(
GcpErrorCodeToTfErrorCode(status.error_code()))),
" error message:", status.error_message(),
" error details: ", status.error_details());
}
Expand Down
39 changes: 20 additions & 19 deletions tensorflow_io/core/kernels/bigtable/bigtable_dataset_kernel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,43 +32,43 @@
namespace data {
namespace {

tensorflow::error::Code GoogleCloudErrorCodeToTfErrorCode(
absl::StatusCode GoogleCloudErrorCodeToTfErrorCode(
::google::cloud::StatusCode code) {
switch (code) {
case ::google::cloud::StatusCode::kOk:
return ::tensorflow::error::OK;
return absl::StatusCode::kOk;
case ::google::cloud::StatusCode::kCancelled:
return ::tensorflow::error::CANCELLED;
return absl::StatusCode::kCancelled;
case ::google::cloud::StatusCode::kInvalidArgument:
return ::tensorflow::error::INVALID_ARGUMENT;
return absl::StatusCode::kInvalidArgument;
case ::google::cloud::StatusCode::kDeadlineExceeded:
return ::tensorflow::error::DEADLINE_EXCEEDED;
return absl::StatusCode::kDeadlineExceeded;
case ::google::cloud::StatusCode::kNotFound:
return ::tensorflow::error::NOT_FOUND;
return absl::StatusCode::kNotFound;
case ::google::cloud::StatusCode::kAlreadyExists:
return ::tensorflow::error::ALREADY_EXISTS;
return absl::StatusCode::kAlreadyExists;
case ::google::cloud::StatusCode::kPermissionDenied:
return ::tensorflow::error::PERMISSION_DENIED;
return absl::StatusCode::kPermissionDenied;
case ::google::cloud::StatusCode::kUnauthenticated:
return ::tensorflow::error::UNAUTHENTICATED;
return absl::StatusCode::kUnauthenticated;
case ::google::cloud::StatusCode::kResourceExhausted:
return ::tensorflow::error::RESOURCE_EXHAUSTED;
return absl::StatusCode::kResourceExhausted;
case ::google::cloud::StatusCode::kFailedPrecondition:
return ::tensorflow::error::FAILED_PRECONDITION;
return absl::StatusCode::kFailedPrecondition;
case ::google::cloud::StatusCode::kAborted:
return ::tensorflow::error::ABORTED;
return absl::StatusCode::kAborted;
case ::google::cloud::StatusCode::kOutOfRange:
return ::tensorflow::error::OUT_OF_RANGE;
return absl::StatusCode::kOutOfRange;
case ::google::cloud::StatusCode::kUnimplemented:
return ::tensorflow::error::UNIMPLEMENTED;
return absl::StatusCode::kUnimplemented;
case ::google::cloud::StatusCode::kInternal:
return ::tensorflow::error::INTERNAL;
return absl::StatusCode::kInternal;
case ::google::cloud::StatusCode::kUnavailable:
return ::tensorflow::error::UNAVAILABLE;
return absl::StatusCode::kUnavailable;
case ::google::cloud::StatusCode::kDataLoss:
return ::tensorflow::error::DATA_LOSS;
return absl::StatusCode::kDataLoss;
default:
return ::tensorflow::error::UNKNOWN;
return absl::StatusCode::kUnnown;
}
}

Expand All @@ -77,7 +77,8 @@
return OkStatus();
}
return Status(
GoogleCloudErrorCodeToTfErrorCode(status.code()),
static_cast<::tensorflow::errors::Code>(
GoogleCloudErrorCodeToTfErrorCode(status.code())),

Check warning on line 81 in tensorflow_io/core/kernels/bigtable/bigtable_dataset_kernel.cc

View workflow job for this annotation

GitHub Actions / Clang Format 

[reviewdog-suggester] reported by reviewdog 🐶


Raw Output:
tensorflow_io/core/kernels/bigtable/bigtable_dataset_kernel.cc:81:-      GoogleCloudErrorCodeToTfErrorCode(status.code())),
tensorflow_io/core/kernels/bigtable/bigtable_dataset_kernel.cc:81:+          GoogleCloudErrorCodeToTfErrorCode(status.code())),
strings::StrCat("Error reading from Cloud Bigtable: ", status.message()));
}

Expand Down
5 changes: 3 additions & 2 deletions tensorflow_io/core/kernels/gsmemcachedfs/gce_memcached_server_list_provider.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@
if (success) {
return OkStatus();
} else {
return Status(tensorflow::error::FAILED_PRECONDITION,
"Unexpected server list format");
return Status(

Check warning on line 48 in tensorflow_io/core/kernels/gsmemcachedfs/gce_memcached_server_list_provider.cc

View workflow job for this annotation

GitHub Actions / Clang Format 

[reviewdog-suggester] reported by reviewdog 🐶


Raw Output:
tensorflow_io/core/kernels/gsmemcachedfs/gce_memcached_server_list_provider.cc:48:-    return Status(
tensorflow_io/core/kernels/gsmemcachedfs/gce_memcached_server_list_provider.cc:49:-        static_cast<tensorflow::errors::Code>(absl::StatusCode::kFailedPrecondition),
tensorflow_io/core/kernels/gsmemcachedfs/gce_memcached_server_list_provider.cc:50:-        "Unexpected server list format");
tensorflow_io/core/kernels/gsmemcachedfs/gce_memcached_server_list_provider.cc:48:+    return Status(static_cast<tensorflow::errors::Code>(
tensorflow_io/core/kernels/gsmemcachedfs/gce_memcached_server_list_provider.cc:49:+                      absl::StatusCode::kFailedPrecondition),
tensorflow_io/core/kernels/gsmemcachedfs/gce_memcached_server_list_provider.cc:50:+                  "Unexpected server list format");
static_cast<tensorflow::errors::Code>(absl::StatusCode::kFailedPrecondition),
"Unexpected server list format");
}
}

Expand Down
Loading