Skip to content
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
104 changes: 94 additions & 10 deletions ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,15 @@ ARG NCPU=4
# ```bash
RUN zypper refresh && \
zypper install --allow-downgrade -y automake cmake curl \
gcc8 gcc8-c++ git gzip libtool make patch tar wget
gcc9 gcc9-c++ git gzip libtool make patch tar wget
# ```

# Install some of the dependencies for `google-cloud-cpp`.

# ```bash
RUN zypper refresh && \
zypper install --allow-downgrade -y abseil-cpp-devel c-ares-devel \
libcurl-devel libopenssl-devel nlohmann_json-devel \
grpc-devel libprotobuf-devel
zypper install --allow-downgrade -y \
libcurl-devel libopenssl-devel nlohmann_json-devel
# ```

# The following steps will install libraries and tools in `/usr/local`. openSUSE
Expand All @@ -52,19 +51,52 @@ ENV PATH=/usr/local/bin:${PATH}

# Use the following environment variables to configure the compiler used by
# CMake.
ENV CC=gcc-8
ENV CXX=g++-8
ENV CC=gcc-9
ENV CXX=g++-9

# #### opentelemetry-cpp
# #### Abseil

# ```bash
WORKDIR /var/tmp/build/abseil-cpp
RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250814.2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_CXX_STANDARD=17 \
-DABSL_BUILD_TESTING=OFF \
-DBUILD_SHARED_LIBS=yes \
-S . -B cmake-out && \
cmake --build cmake-out -- -j ${NCPU:-4} && \
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
ldconfig
# ```

# #### Protobuf

# ```bash
WORKDIR /var/tmp/build/protobuf
RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.1.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_CXX_STANDARD=17 \
-DBUILD_SHARED_LIBS=yes \
-Dprotobuf_BUILD_TESTS=OFF \
-Dprotobuf_ABSL_PROVIDER=package \
-S . -B cmake-out && \
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
ldconfig && \
ln -s /usr/local/bin/protoc /usr/bin/protoc
# ```

# The project has a dependency on the OpenTelemetry library.
# #### opentelemetry-cpp

# ```bash
WORKDIR /var/tmp/build/opentelemetry-cpp
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_CXX_STANDARD=17 \
-DBUILD_SHARED_LIBS=yes \
-DWITH_EXAMPLES=OFF \
Expand All @@ -77,6 +109,58 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24
ldconfig
# ```

# #### c-ares

# ```bash
WORKDIR /var/tmp/build/c-ares
RUN curl -fsSL https://github.com/c-ares/c-ares/archive/refs/tags/cares-1_17_1.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DBUILD_SHARED_LIBS=yes \
-S . -B cmake-out && \
cmake --build cmake-out --target install && \
ldconfig
# ```

# #### RE2

# ```bash
WORKDIR /var/tmp/build/re2
RUN curl -fsSL https://github.com/google/re2/archive/2025-07-22.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake -DCMAKE_BUILD_TYPE=Debug \
-DBUILD_SHARED_LIBS=ON \
-DRE2_BUILD_TESTING=OFF \
-S . -B cmake-out && \
cmake --build cmake-out --target install && \
ldconfig
# ```

# #### gRPC

# ```bash
WORKDIR /var/tmp/build/grpc
RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.71.1.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_CXX_STANDARD=17 \
-DBUILD_SHARED_LIBS=yes \
-DgRPC_INSTALL=ON \
-DgRPC_BUILD_TESTS=OFF \
-DgRPC_ABSL_PROVIDER=package \
-DgRPC_CARES_PROVIDER=package \
-DgRPC_PROTOBUF_PROVIDER=package \
-DgRPC_RE2_PROVIDER=package \
-DgRPC_SSL_PROVIDER=package \
-DgRPC_ZLIB_PROVIDER=package \
-DgRPC_OPENTELEMETRY_PROVIDER=package \
-S . -B cmake-out && \
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
ldconfig
# ```

## [DONE packaging.md]

RUN zypper refresh && \
Expand All @@ -91,5 +175,5 @@ RUN curl -fsSL https://github.com/mozilla/sccache/releases/download/v0.10.0/scca

# Update the ld.conf cache in case any libraries were installed in /usr/local/lib*
RUN ldconfig /usr/local/lib*

ENV DEMO_CORD_WORKAROUND=OFF
RUN echo 'root:cloudcxx' | chpasswd
100 changes: 92 additions & 8 deletions doc/packaging.md
Original file line number Diff line number Diff line change
Expand Up @@ -332,16 +332,15 @@ use GCC 8 or higher to compile `google-cloud-cpp`.
```bash
sudo zypper refresh && \
sudo zypper install --allow-downgrade -y automake cmake curl \
gcc8 gcc8-c++ git gzip libtool make patch tar wget
gcc9 gcc9-c++ git gzip libtool make patch tar wget
```

Install some of the dependencies for `google-cloud-cpp`.

```bash
sudo zypper refresh && \
sudo zypper install --allow-downgrade -y abseil-cpp-devel c-ares-devel \
libcurl-devel libopenssl-devel nlohmann_json-devel \
grpc-devel libprotobuf-devel
sudo zypper install --allow-downgrade -y \
libcurl-devel libopenssl-devel nlohmann_json-devel
```

The following steps will install libraries and tools in `/usr/local`. openSUSE
Expand All @@ -356,18 +355,51 @@ export PATH=/usr/local/bin:${PATH}
```

Use the following environment variables to configure the compiler used by CMake.
export CC=gcc-8 export CXX=g++-8
export CC=gcc-9 export CXX=g++-9

#### opentelemetry-cpp
#### Abseil

The project has a dependency on the OpenTelemetry library.
```bash
mkdir -p $HOME/Downloads/abseil-cpp && cd $HOME/Downloads/abseil-cpp
curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250814.2.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_CXX_STANDARD=17 \
-DABSL_BUILD_TESTING=OFF \
-DBUILD_SHARED_LIBS=yes \
-S . -B cmake-out && \
cmake --build cmake-out -- -j ${NCPU:-4} && \
sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
sudo ldconfig
```

#### Protobuf

```bash
mkdir -p $HOME/Downloads/protobuf && cd $HOME/Downloads/protobuf
curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v33.1.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_CXX_STANDARD=17 \
-DBUILD_SHARED_LIBS=yes \
-Dprotobuf_BUILD_TESTS=OFF \
-Dprotobuf_ABSL_PROVIDER=package \
-S . -B cmake-out && \
sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
sudo ldconfig && \
ln -s /usr/local/bin/protoc /usr/bin/protoc
```

#### opentelemetry-cpp

```bash
mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_CXX_STANDARD=17 \
-DBUILD_SHARED_LIBS=yes \
-DWITH_EXAMPLES=OFF \
Expand All @@ -380,6 +412,58 @@ sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
sudo ldconfig
```

#### c-ares

```bash
mkdir -p $HOME/Downloads/c-ares && cd $HOME/Downloads/c-ares
curl -fsSL https://github.com/c-ares/c-ares/archive/refs/tags/cares-1_17_1.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DBUILD_SHARED_LIBS=yes \
-S . -B cmake-out && \
sudo cmake --build cmake-out --target install && \
sudo ldconfig
```

#### RE2

```bash
mkdir -p $HOME/Downloads/re2 && cd $HOME/Downloads/re2
curl -fsSL https://github.com/google/re2/archive/2025-07-22.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake -DCMAKE_BUILD_TYPE=Debug \
-DBUILD_SHARED_LIBS=ON \
-DRE2_BUILD_TESTING=OFF \
-S . -B cmake-out && \
sudo cmake --build cmake-out --target install && \
sudo ldconfig
```

#### gRPC

```bash
mkdir -p $HOME/Downloads/grpc && cd $HOME/Downloads/grpc
curl -fsSL https://github.com/grpc/grpc/archive/v1.71.1.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_CXX_STANDARD=17 \
-DBUILD_SHARED_LIBS=yes \
-DgRPC_INSTALL=ON \
-DgRPC_BUILD_TESTS=OFF \
-DgRPC_ABSL_PROVIDER=package \
-DgRPC_CARES_PROVIDER=package \
-DgRPC_PROTOBUF_PROVIDER=package \
-DgRPC_RE2_PROVIDER=package \
-DgRPC_SSL_PROVIDER=package \
-DgRPC_ZLIB_PROVIDER=package \
-DgRPC_OPENTELEMETRY_PROVIDER=package \
-S . -B cmake-out && \
sudo cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
sudo ldconfig
```

#### Compile and install the main project

We can now compile and install `google-cloud-cpp`:
Expand Down
3 changes: 3 additions & 0 deletions google/cloud/bigtable/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,8 @@ add_library(
internal/row_reader_impl.h
internal/rpc_policy_parameters.h
internal/rpc_policy_parameters.inc
internal/stub_manager.cc
internal/stub_manager.h
internal/traced_row_reader.cc
internal/traced_row_reader.h
internal/tuple_utils.h
Expand Down Expand Up @@ -461,6 +463,7 @@ if (BUILD_TESTING)
internal/query_plan_test.cc
internal/rate_limiter_test.cc
internal/retry_traits_test.cc
internal/stub_manager_test.cc
internal/traced_row_reader_test.cc
internal/tuple_utils_test.cc
mocks/mock_row_reader_test.cc
Expand Down
1 change: 1 addition & 0 deletions google/cloud/bigtable/bigtable_client_unit_tests.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ bigtable_client_unit_tests = [
"internal/query_plan_test.cc",
"internal/rate_limiter_test.cc",
"internal/retry_traits_test.cc",
"internal/stub_manager_test.cc",
"internal/traced_row_reader_test.cc",
"internal/tuple_utils_test.cc",
"mocks/mock_row_reader_test.cc",
Expand Down
2 changes: 2 additions & 0 deletions google/cloud/bigtable/google_cloud_cpp_bigtable.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ google_cloud_cpp_bigtable_hdrs = [
"internal/row_reader_impl.h",
"internal/rpc_policy_parameters.h",
"internal/rpc_policy_parameters.inc",
"internal/stub_manager.h",
"internal/traced_row_reader.h",
"internal/tuple_utils.h",
"internal/unary_client_utils.h",
Expand Down Expand Up @@ -213,6 +214,7 @@ google_cloud_cpp_bigtable_srcs = [
"internal/rate_limiter.cc",
"internal/readrowsparser.cc",
"internal/retry_traits.cc",
"internal/stub_manager.cc",
"internal/traced_row_reader.cc",
"mutation_batcher.cc",
"mutations.cc",
Expand Down
51 changes: 51 additions & 0 deletions google/cloud/bigtable/internal/stub_manager.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
// Copyright 2026 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/bigtable/internal/stub_manager.h"
#include <utility>

namespace google {
namespace cloud {
namespace bigtable_internal {
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN

StubManager::StubManager(std::shared_ptr<BigtableStub> stub)
: stub_(std::move(stub)) {}

StubManager::StubManager(
absl::flat_hash_map<std::string, std::shared_ptr<BigtableStub>>
affinity_stubs,
StubCreationFn stub_creation_fn)
: stub_creation_fn_(std::move(stub_creation_fn)),
affinity_stubs_(std::move(affinity_stubs)) {}

std::shared_ptr<BigtableStub> StubManager::GetStub(
std::string_view instance_name) {
if (stub_) return stub_;

std::scoped_lock lk(mu_);
if (auto iter = affinity_stubs_.find(instance_name);
iter != affinity_stubs_.end()) {
return iter->second;
}
auto inserted = affinity_stubs_.emplace(
std::string{instance_name},
stub_creation_fn_(instance_name, Priming::kNoPriming));
return inserted.first->second;
}

GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
} // namespace bigtable_internal
} // namespace cloud
} // namespace google
Loading