From 6b360306b9768f587737ca4e400a1f5f3c96a5dd Mon Sep 17 00:00:00 2001 From: Colin Moy Date: Fri, 26 Jun 2026 21:54:48 +0000 Subject: [PATCH] chore(bigquery): migrate to std::optional --- .../bigquery/v2/minimal/internal/common_v2_resources.h | 2 +- .../bigquery/v2/minimal/internal/dataset_request.h | 2 +- google/cloud/bigquery/v2/minimal/internal/job.h | 2 +- .../bigquery/v2/minimal/internal/job_query_stats.h | 2 +- .../cloud/bigquery/v2/minimal/internal/job_request.h | 10 +++++----- google/cloud/bigquery/v2/minimal/internal/job_stats.h | 2 +- google/cloud/bigquery/v2/minimal/internal/project.h | 2 +- .../bigquery/v2/minimal/internal/project_request.h | 2 +- google/cloud/bigquery/v2/minimal/internal/table.h | 2 +- .../cloud/bigquery/v2/minimal/internal/table_request.h | 2 +- .../v2/minimal/testing/job_query_test_utils.cc | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/google/cloud/bigquery/v2/minimal/internal/common_v2_resources.h b/google/cloud/bigquery/v2/minimal/internal/common_v2_resources.h index 6ad69aa224bc6..ae44d70743704 100644 --- a/google/cloud/bigquery/v2/minimal/internal/common_v2_resources.h +++ b/google/cloud/bigquery/v2/minimal/internal/common_v2_resources.h @@ -316,7 +316,7 @@ bool operator==(Struct const& lhs, Struct const& rhs); struct ColumnData { std::string value; - // TODO(#14387): Use absl::optional instead. + // TODO(#14387): Use std::optional instead. bool is_null{false}; std::string DebugString(absl::string_view name, TracingOptions const& options = {}, diff --git a/google/cloud/bigquery/v2/minimal/internal/dataset_request.h b/google/cloud/bigquery/v2/minimal/internal/dataset_request.h index de1b693eeaf4e..c62d7543a492c 100644 --- a/google/cloud/bigquery/v2/minimal/internal/dataset_request.h +++ b/google/cloud/bigquery/v2/minimal/internal/dataset_request.h @@ -21,7 +21,7 @@ #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" #include "absl/strings/string_view.h" -#include "absl/types/optional.h" +#include #include namespace google { diff --git a/google/cloud/bigquery/v2/minimal/internal/job.h b/google/cloud/bigquery/v2/minimal/internal/job.h index 8ff85b79644c2..f545d98d90d7a 100644 --- a/google/cloud/bigquery/v2/minimal/internal/job.h +++ b/google/cloud/bigquery/v2/minimal/internal/job.h @@ -20,8 +20,8 @@ #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" #include "absl/strings/string_view.h" -#include "absl/types/optional.h" #include +#include #include namespace google { diff --git a/google/cloud/bigquery/v2/minimal/internal/job_query_stats.h b/google/cloud/bigquery/v2/minimal/internal/job_query_stats.h index ab04518c5ed86..371894aa96ae2 100644 --- a/google/cloud/bigquery/v2/minimal/internal/job_query_stats.h +++ b/google/cloud/bigquery/v2/minimal/internal/job_query_stats.h @@ -20,9 +20,9 @@ #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" #include "absl/strings/string_view.h" -#include "absl/types/optional.h" #include #include +#include #include namespace google { diff --git a/google/cloud/bigquery/v2/minimal/internal/job_request.h b/google/cloud/bigquery/v2/minimal/internal/job_request.h index f35d056d7bce5..6dfd12633850c 100644 --- a/google/cloud/bigquery/v2/minimal/internal/job_request.h +++ b/google/cloud/bigquery/v2/minimal/internal/job_request.h @@ -23,9 +23,9 @@ #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" #include "absl/strings/string_view.h" -#include "absl/types/optional.h" #include #include +#include #include #include @@ -114,11 +114,11 @@ class ListJobsRequest { std::string const& project_id() const { return project_id_; } bool const& all_users() const { return all_users_; } std::int32_t const& max_results() const { return max_results_; } - absl::optional const& + std::optional const& min_creation_time() const { return min_creation_time_; } - absl::optional const& + std::optional const& max_creation_time() const { return max_creation_time_; } @@ -211,8 +211,8 @@ class ListJobsRequest { std::string project_id_; bool all_users_; std::int32_t max_results_; - absl::optional min_creation_time_; - absl::optional max_creation_time_; + std::optional min_creation_time_; + std::optional max_creation_time_; std::string page_token_; Projection projection_; StateFilter state_filter_; diff --git a/google/cloud/bigquery/v2/minimal/internal/job_stats.h b/google/cloud/bigquery/v2/minimal/internal/job_stats.h index cd289ada61349..f1c1362de0e45 100644 --- a/google/cloud/bigquery/v2/minimal/internal/job_stats.h +++ b/google/cloud/bigquery/v2/minimal/internal/job_stats.h @@ -20,9 +20,9 @@ #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" #include "absl/strings/string_view.h" -#include "absl/types/optional.h" #include #include +#include #include namespace google { diff --git a/google/cloud/bigquery/v2/minimal/internal/project.h b/google/cloud/bigquery/v2/minimal/internal/project.h index 9a6badbe926ab..dd8c681d3b30d 100644 --- a/google/cloud/bigquery/v2/minimal/internal/project.h +++ b/google/cloud/bigquery/v2/minimal/internal/project.h @@ -18,8 +18,8 @@ #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" #include "absl/strings/string_view.h" -#include "absl/types/optional.h" #include +#include #include namespace google { diff --git a/google/cloud/bigquery/v2/minimal/internal/project_request.h b/google/cloud/bigquery/v2/minimal/internal/project_request.h index c225b3c1e8f44..30c19b55c1f3a 100644 --- a/google/cloud/bigquery/v2/minimal/internal/project_request.h +++ b/google/cloud/bigquery/v2/minimal/internal/project_request.h @@ -21,7 +21,7 @@ #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" #include "absl/strings/string_view.h" -#include "absl/types/optional.h" +#include #include namespace google { diff --git a/google/cloud/bigquery/v2/minimal/internal/table.h b/google/cloud/bigquery/v2/minimal/internal/table.h index 90b0f6850ee30..f780c5cf2609d 100644 --- a/google/cloud/bigquery/v2/minimal/internal/table.h +++ b/google/cloud/bigquery/v2/minimal/internal/table.h @@ -23,9 +23,9 @@ #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" #include "absl/strings/string_view.h" -#include "absl/types/optional.h" #include #include +#include #include namespace google { diff --git a/google/cloud/bigquery/v2/minimal/internal/table_request.h b/google/cloud/bigquery/v2/minimal/internal/table_request.h index 03432b200a187..c9ddd682abc0b 100644 --- a/google/cloud/bigquery/v2/minimal/internal/table_request.h +++ b/google/cloud/bigquery/v2/minimal/internal/table_request.h @@ -22,7 +22,7 @@ #include "google/cloud/tracing_options.h" #include "google/cloud/version.h" #include "absl/strings/string_view.h" -#include "absl/types/optional.h" +#include #include namespace google { diff --git a/google/cloud/bigquery/v2/minimal/testing/job_query_test_utils.cc b/google/cloud/bigquery/v2/minimal/testing/job_query_test_utils.cc index 577f1588c73c7..05cd11eb88966 100644 --- a/google/cloud/bigquery/v2/minimal/testing/job_query_test_utils.cc +++ b/google/cloud/bigquery/v2/minimal/testing/job_query_test_utils.cc @@ -58,7 +58,7 @@ QueryRequest MakeQueryRequest() { .set_create_session(true) .set_max_results(10) .set_maximum_bytes_billed(100000) - .set_timeout(std::chrono ::milliseconds(10)); + .set_timeout(std::chrono::milliseconds(10)); std::vector props; props.push_back(MakeConnectionProperty());