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.

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

impl(bigquerycontrol): promote from experimental to transitional #14887

Merged
merged 3 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@ See each library's `README.md` file for more information about:
- [Google Cloud BigQuery](google/cloud/bigquery/README.md)
[[quickstart]](google/cloud/bigquery/quickstart/README.md)
[[reference]](https://cloud.google.com/cpp/docs/reference/bigquery/latest)
- [BigQuery API](google/cloud/bigquerycontrol/README.md)
[[quickstart]](google/cloud/bigquerycontrol/quickstart/README.md)
[[reference]](https://cloud.google.com/cpp/docs/reference/bigquerycontrol/latest)
- [Google Cloud Bigtable](google/cloud/bigtable/README.md)
[[quickstart]](google/cloud/bigtable/quickstart/README.md)
[[reference]](https://cloud.google.com/cpp/docs/reference/bigtable/latest)
Expand Down
Binary file not shown.
3 changes: 1 addition & 2 deletions cmake/GoogleCloudCppFeatures.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,11 @@ set(GOOGLE_CLOUD_CPP_NO_GRPC_FEATURES

set(GOOGLE_CLOUD_CPP_EXPERIMENTAL_LIBRARIES
# cmake-format: sort
"bigquerycontrol" # Some proto RPC comments indicate experimental methods.
"pubsublite" # This is WIP, it needs a number of hand-crafted APIs.
)

set(GOOGLE_CLOUD_CPP_TRANSITION_LIBRARIES # cmake-format: sort
"storage_grpc")
"bigquerycontrol" "storage_grpc")

set(GOOGLE_CLOUD_CPP_GA_LIBRARIES
# cmake-format: sort
Expand Down
2 changes: 1 addition & 1 deletion google/cloud/bigquerycontrol/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ cc_library(
srcs = [sample],
tags = ["integration-test"],
deps = [
"//:experimental-bigquerycontrol",
"//:bigquerycontrol",
"//google/cloud/testing_util:google_cloud_cpp_testing_private",
],
) for sample in glob([d + "samples/*.cc" for d in service_dirs])]
10 changes: 4 additions & 6 deletions google/cloud/bigquerycontrol/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@

include(GoogleCloudCppLibrary)

google_cloud_cpp_add_gapic_library(
bigquerycontrol "Cloud BigQuery Control API" EXPERIMENTAL REST_TRANSPORT
SERVICE_DIRS "v2/")
google_cloud_cpp_add_gapic_library(bigquerycontrol "Cloud BigQuery Control API"
TRANSITION REST_TRANSPORT SERVICE_DIRS "v2/")

if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS)
add_executable(bigquerycontrol_quickstart "quickstart/quickstart.cc")
target_link_libraries(
bigquerycontrol_quickstart
PRIVATE google-cloud-cpp::experimental-bigquerycontrol)
target_link_libraries(bigquerycontrol_quickstart
PRIVATE google-cloud-cpp::bigquerycontrol)
google_cloud_cpp_add_common_options(bigquerycontrol_quickstart)
add_test(
NAME bigquerycontrol_quickstart
Expand Down
8 changes: 2 additions & 6 deletions google/cloud/bigquerycontrol/README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
# BigQuery API C++ Client Library

:construction:

This directory contains an idiomatic C++ client library for the
[BigQuery API][cloud-service-docs].

A data platform for customers to create, manage, share and query data.

This library is **experimental**. Its APIs are subject to change without notice.
dbolduc marked this conversation as resolved.
Show resolved Hide resolved

Please, note that the Google Cloud C++ client libraries do **not** follow
[Semantic Versioning](https://semver.org/).
While this library is **GA**, please note Google Cloud C++ client libraries do
**not** follow [Semantic Versioning](https://semver.org/).

## Quickstart

Expand Down
6 changes: 2 additions & 4 deletions google/cloud/bigquerycontrol/doc/main.dox
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ An idiomatic C++ client library for the [BigQuery API][cloud-service-docs].

A data platform for customers to create, manage, share and query data.

This library is **experimental**. Its APIs are subject to change without notice.

Please, note that the Google Cloud C++ client libraries do **not** follow
[Semantic Versioning](https://semver.org/).
While this library is **GA**, please note Google Cloud C++ client libraries do
**not** follow [Semantic Versioning](https://semver.org/).

@tableofcontents{HTML:2}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ licenses(["notice"]) # Apache 2.0
"integration-test",
],
deps = [
"//:experimental-bigquerycontrol",
"//:bigquerycontrol",
"//google/cloud/testing_util:google_cloud_cpp_testing_private",
],
) for test in glob(["*_test.cc"])]
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,8 @@ foreach (fname ${bigquerycontrol_integration_tests})
google_cloud_cpp_add_executable(target "bigquerycontrol" ${fname})
target_link_libraries(
${target}
PRIVATE google-cloud-cpp::experimental-bigquerycontrol
google_cloud_cpp_testing GTest::gmock_main GTest::gmock
GTest::gtest)
PRIVATE google-cloud-cpp::bigquerycontrol google_cloud_cpp_testing
GTest::gmock_main GTest::gmock GTest::gtest)
google_cloud_cpp_add_common_options(${target})
add_test(NAME ${target} COMMAND ${target})
set_tests_properties(
Expand Down
1 change: 1 addition & 0 deletions google/cloud/bigquerycontrol/quickstart/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ cc_binary(
"quickstart.cc",
],
deps = [
# TODO(#14891): switch to GA target
"@google_cloud_cpp//:experimental-bigquerycontrol",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted.

],
)
1 change: 1 addition & 0 deletions google/cloud/bigquerycontrol/quickstart/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ endif ()

# Define your targets.
add_executable(quickstart quickstart.cc)
# TODO(#14891): switch to GA target.
target_link_libraries(quickstart google-cloud-cpp::experimental-bigquerycontrol)
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void ExecuteQueryJob(std::vector<std::string> const& argv) {

bigquery_v2_proto::JobConfiguration config;
*config.mutable_query() = query_config;
config.mutable_labels()->emplace("type", "sample");
(*config.mutable_labels())["type"] = "sample";
bigquery_v2_proto::Job job;
*job.mutable_configuration() = config;
bigquery_v2_proto::InsertJobRequest job_request;
Expand Down
2 changes: 1 addition & 1 deletion google/cloud/spanner/samples/samples.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1747,7 +1747,7 @@ void RestoreDatabaseWithEncryptionKeyCommand(std::vector<std::string> argv) {
// [START spanner_restore_backup_with_MR_CMEK]
void RestoreDatabaseWithMRCMEK(
google::cloud::spanner_admin::DatabaseAdminClient client,
BackupIdentifier src, std::string const& database_id,
BackupIdentifier const& src, std::string const& database_id,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

odd that we are making a spanner change in this PR, but it looks like a good change

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For reasons unknown, clang-tidy complained about it in this PR, not whichever PR is was introduced in.

std::vector<google::cloud::KmsKeyName> const& encryption_keys) {
google::cloud::spanner::Database database(src.project_id, src.instance_id,
database_id);
Expand Down
2 changes: 1 addition & 1 deletion libraries.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
"""Automatically generated unit tests list - DO NOT EDIT."""

GOOGLE_CLOUD_CPP_EXPERIMENTAL_LIBRARIES = [
"bigquerycontrol",
"pubsublite",
]

GOOGLE_CLOUD_CPP_TRANSITION_LIBRARIES = [
"bigquerycontrol",
"storage_grpc",
]

Expand Down
Loading