Merge pull request #15 from scotthart/add_get_job

impl: add GetJob with integration test

Author: scotthart

google/cloud/bigquery_unified/CMakeLists.txt

@@ -129,7 +129,15 @@ bigquery_unified_library(
 
 set(bigquery_unified_library_files
     # cmake-format: sort
-    client.cc client.h connection.cc connection.h read_arrow_response.h)
+    client.cc
+    client.h
+    connection.cc
+    connection.h
+    internal/connection_impl.cc
+    internal/connection_impl.h
+    internal/default_options.cc
+    internal/default_options.h
+    read_arrow_response.h)
 
 set(bigquery_unified_deps
     # cmake-format: sort

google/cloud/bigquery_unified/connection.cc

@@ -13,6 +13,8 @@
 // limitations under the License.
 
 #include "google/cloud/bigquery_unified/connection.h"
+#include "google/cloud/bigquery_unified/internal/connection_impl.h"
+#include "google/cloud/bigquery_unified/internal/default_options.h"
 #include "google/cloud/internal/make_status.h"
 #include "google/cloud/internal/pagination_range.h"
 
@@ -98,7 +100,10 @@ StatusOr<ReadArrowResponse> Connection::ReadArrow(
   return internal::UnimplementedError("not implemented");
 }
 
-std::shared_ptr<Connection> MakeConnection(Options options) { return {}; }
+std::shared_ptr<Connection> MakeConnection(Options options) {
+  return bigquery_unified_internal::MakeDefaultConnectionImpl(
+      bigquery_unified_internal::DefaultOptions(std::move(options)));
+}
 
 GOOGLE_CLOUD_CPP_BIGQUERY_INLINE_NAMESPACE_END
 }  // namespace google::cloud::bigquery_unified

google/cloud/bigquery_unified/google_cloud_cpp_bigquery_bigquery_unified.bzl

@@ -19,10 +19,14 @@
 google_cloud_cpp_bigquery_bigquery_unified_hdrs = [
     "client.h",
     "connection.h",
+    "internal/connection_impl.h",
+    "internal/default_options.h",
     "read_arrow_response.h",
 ]
 
 google_cloud_cpp_bigquery_bigquery_unified_srcs = [
     "client.cc",
     "connection.cc",
+    "internal/connection_impl.cc",
+    "internal/default_options.cc",
 ]

google/cloud/bigquery_unified/integration_tests/job_integration_test.cc

@@ -15,13 +15,40 @@
 #include "google/cloud/bigquery_unified/client.h"
 #include "google/cloud/bigquery_unified/testing_util/status_matchers.h"
 #include "google/cloud/bigquery_unified/version.h"
+#include "google/cloud/internal/getenv.h"
 #include <gmock/gmock.h>
 
 namespace google::cloud::bigquery_unified {
 GOOGLE_CLOUD_CPP_BIGQUERY_INLINE_NAMESPACE_BEGIN
 namespace {
 
-TEST(JobIntegrationTest, Success) { EXPECT_TRUE(true); }
+using ::testing::Eq;
+
+class JobIntegrationTest : public ::testing::Test {
+ protected:
+  void SetUp() override {
+    project_id_ =
+        google::cloud::internal::GetEnv("GOOGLE_CLOUD_PROJECT").value_or("");
+    ASSERT_FALSE(project_id_.empty());
+  }
+  std::string project_id_;
+};
+
+TEST_F(JobIntegrationTest, GetJob) {
+  namespace bigquery_proto = google::cloud::bigquery::v2;
+  std::shared_ptr<Connection> connection =
+      google::cloud::bigquery_unified::MakeConnection();
+  auto client = google::cloud::bigquery_unified::Client(connection);
+
+  // TODO: hard coding this id is brittle but currently necessary.
+  std::string const job_id = "job_TyRhPS6z-5_e9JSwtT8ieuwDOdLD";
+  bigquery_proto::GetJobRequest get_request;
+  get_request.set_project_id(project_id_);
+  get_request.set_job_id(job_id);
+  auto job = client.GetJob(get_request);
+  ASSERT_STATUS_OK(job);
+  EXPECT_THAT(job->status().state(), Eq("DONE"));
+}
 
 }  // namespace
 GOOGLE_CLOUD_CPP_BIGQUERY_INLINE_NAMESPACE_END

google/cloud/bigquery_unified/internal/connection_impl.cc

@@ -0,0 +1,69 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "google/cloud/bigquery_unified/internal/connection_impl.h"
+#include "google/cloud/bigquerycontrol/v2/internal/job_option_defaults.h"
+#include "google/cloud/bigquerycontrol/v2/internal/job_rest_connection_impl.h"
+#include "google/cloud/bigquerycontrol/v2/internal/job_rest_stub_factory.h"
+#include "google/cloud/bigquerycontrol/v2/internal/job_tracing_connection.h"
+#include "google/cloud/background_threads.h"
+#include "google/cloud/internal/rest_background_threads_impl.h"
+
+namespace google::cloud::bigquery_unified_internal {
+GOOGLE_CLOUD_CPP_BIGQUERY_INLINE_NAMESPACE_BEGIN
+
+ConnectionImpl::ConnectionImpl(
+    std::shared_ptr<google::cloud::bigquerycontrol_v2::JobServiceConnection>
+        job_connection,
+    google::cloud::Options job_options,
+    std::shared_ptr<bigquerycontrol_v2_internal::JobServiceRestStub> job_stub,
+    google::cloud::Options options)
+    : job_connection_(std::move(job_connection)),
+      job_stub_(std::move(job_stub)),
+      job_options_(std::move(job_options)),
+      options_(std::move(options)) {}
+
+StatusOr<google::cloud::bigquery::v2::Job> ConnectionImpl::GetJob(
+    google::cloud::bigquery::v2::GetJobRequest const& request, Options opts) {
+  // TODO: Instead of creating an OptionsSpan, pass opts when job_connection_
+  // supports it.
+  internal::OptionsSpan span(internal::MergeOptions(
+      std::move(opts), internal::MergeOptions(options_, job_options_)));
+  return job_connection_->GetJob(request);
+}
+
+std::shared_ptr<bigquery_unified::Connection> MakeDefaultConnectionImpl(
+    Options options) {
+  auto job_options =
+      bigquerycontrol_v2_internal::JobServiceDefaultOptions(options);
+  auto job_background = std::make_unique<
+      rest_internal::AutomaticallyCreatedRestBackgroundThreads>();
+  auto job_stub =
+      bigquerycontrol_v2_internal::CreateDefaultJobServiceRestStub(job_options);
+  std::shared_ptr<bigquerycontrol_v2::JobServiceConnection> job_connection =
+      bigquerycontrol_v2_internal::MakeJobServiceTracingConnection(
+          std::make_shared<
+              bigquerycontrol_v2_internal::JobServiceRestConnectionImpl>(
+              std::move(job_background), job_stub, job_options));
+
+  // TODO: We should probably add a TracingConnection decorator in order to
+  //  associate all the various rpcs that are called as part of these
+  //  operations.
+  return std::make_shared<bigquery_unified_internal::ConnectionImpl>(
+      std::move(job_connection), std::move(job_options), std::move(job_stub),
+      std::move(options));
+}
+
+GOOGLE_CLOUD_CPP_BIGQUERY_INLINE_NAMESPACE_END
+}  // namespace google::cloud::bigquery_unified_internal

google/cloud/bigquery_unified/internal/connection_impl.h

@@ -0,0 +1,56 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef GOOGLE_CLOUD_CPP_BIGQUERY_GOOGLE_CLOUD_BIGQUERY_UNIFIED_INTERNAL_CONNECTION_IMPL_H
+#define GOOGLE_CLOUD_CPP_BIGQUERY_GOOGLE_CLOUD_BIGQUERY_UNIFIED_INTERNAL_CONNECTION_IMPL_H
+
+#include "google/cloud/bigquery_unified/connection.h"
+#include "google/cloud/bigquery_unified/version.h"
+#include "google/cloud/bigquerycontrol/v2/internal/job_rest_stub.h"
+#include "google/cloud/bigquerycontrol/v2/job_connection.h"
+
+namespace google::cloud::bigquery_unified_internal {
+GOOGLE_CLOUD_CPP_BIGQUERY_INLINE_NAMESPACE_BEGIN
+
+class ConnectionImpl : public bigquery_unified::Connection {
+ public:
+  ConnectionImpl(
+      std::shared_ptr<google::cloud::bigquerycontrol_v2::JobServiceConnection>
+          job_connection,
+      google::cloud::Options job_options,
+      std::shared_ptr<bigquerycontrol_v2_internal::JobServiceRestStub> job_stub,
+      google::cloud::Options options);
+
+  ~ConnectionImpl() override = default;
+
+  Options options() override { return options_; }
+
+  StatusOr<google::cloud::bigquery::v2::Job> GetJob(
+      google::cloud::bigquery::v2::GetJobRequest const& request,
+      Options opts) override;
+
+ private:
+  std::shared_ptr<bigquerycontrol_v2::JobServiceConnection> job_connection_;
+  std::shared_ptr<bigquerycontrol_v2_internal::JobServiceRestStub> job_stub_;
+  Options job_options_;
+  Options options_;
+};
+
+std::shared_ptr<bigquery_unified::Connection> MakeDefaultConnectionImpl(
+    Options options);
+
+GOOGLE_CLOUD_CPP_BIGQUERY_INLINE_NAMESPACE_END
+}  // namespace google::cloud::bigquery_unified_internal
+
+#endif  // GOOGLE_CLOUD_CPP_BIGQUERY_GOOGLE_CLOUD_BIGQUERY_UNIFIED_INTERNAL_CONNECTION_IMPL_H

google/cloud/bigquery_unified/internal/default_options.cc

@@ -0,0 +1,25 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "google/cloud/bigquery_unified/internal/default_options.h"
+
+namespace google::cloud::bigquery_unified_internal {
+GOOGLE_CLOUD_CPP_BIGQUERY_INLINE_NAMESPACE_BEGIN
+
+google::cloud::Options DefaultOptions(google::cloud::Options options) {
+  return options;
+}
+
+GOOGLE_CLOUD_CPP_BIGQUERY_INLINE_NAMESPACE_END
+}  // namespace google::cloud::bigquery_unified_internal

google/cloud/bigquery_unified/internal/default_options.h

@@ -0,0 +1,29 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef GOOGLE_CLOUD_CPP_BIGQUERY_GOOGLE_CLOUD_BIGQUERY_UNIFIED_INTERNAL_DEFAULT_OPTIONS_H
+#define GOOGLE_CLOUD_CPP_BIGQUERY_GOOGLE_CLOUD_BIGQUERY_UNIFIED_INTERNAL_DEFAULT_OPTIONS_H
+
+#include "google/cloud/bigquery_unified/version.h"
+#include "google/cloud/options.h"
+
+namespace google::cloud::bigquery_unified_internal {
+GOOGLE_CLOUD_CPP_BIGQUERY_INLINE_NAMESPACE_BEGIN
+
+google::cloud::Options DefaultOptions(google::cloud::Options options);
+
+GOOGLE_CLOUD_CPP_BIGQUERY_INLINE_NAMESPACE_END
+}  // namespace google::cloud::bigquery_unified_internal
+
+#endif  // GOOGLE_CLOUD_CPP_BIGQUERY_GOOGLE_CLOUD_BIGQUERY_UNIFIED_INTERNAL_DEFAULT_OPTIONS_H