Skip to content

Commit f9ff105

Browse files
coryancoryan
authored
Move bigtable/* to google/cloud/* (#635)
This fixes #619 #620 #621 #622 #623 #624. Note that this does not include the changes to move the classes to a different namespace (#628).
1 parent 9b73f65 commit f9ff105

210 files changed

Lines changed: 731 additions & 742 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.codecov.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ ignore:
1616
- "/tests/**"
1717
# Ignore the bigtable/client/testing directory, because these are components
1818
# to drive testing, their coverage is not interesting.
19-
- "/bigtable/client/testing/**"
19+
- "/google/cloud/bigtable/testing/**"
2020
# Ignore the bigtable/tests/ directory, because these are integration tests,
2121
# also used to drive testing and therefore their coverage is not interesting.
22-
- "/bigtable/tests/**"
22+
- "/google/cloud/bigtable/tests/**"
2323
# Ignore the benchmarks, they are not important for the experience for our
2424
# users.
25-
- "/bigtable/benchmarks/**"
25+
- "/google/cloud/bigtable/benchmarks/**"
2626
# TODO(#492) - temporarily ignore the examples, they are not running yet.
27-
- "/bigtable/examples/**"
27+
- "/google/cloud/bigtable/examples/**"
2828
# Also ignore the unit tests.
2929
- "**/*_test.cc$"

‎CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ add_custom_target(skip-scanbuild-targets)
7171

7272
# Add subprojects here.
7373
add_subdirectory(google/cloud)
74-
add_subdirectory(bigtable)
7574
add_subdirectory(storage)
7675

7776
# These are tests to reproduce problems in gRPC and other dependencies.

‎bigtable/CMakeLists.txt‎

Lines changed: 0 additions & 117 deletions
This file was deleted.

‎ci/build-bazel.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export PATH=$PATH:$HOME/bin
2424
# We cannot simply use //...:all because when submodules are checked out that
2525
# includes the BUILD files for gRPC, protobuf, etc.
2626
# TODO(#496) - just use //google/...:all when it becomes available.
27-
for subdir in google/cloud bigtable storage; do
27+
for subdir in google/cloud storage; do
2828
bazel --batch build "//${subdir}/...:all"
2929
bazel --batch test \
3030
--test_output=errors \

‎ci/build-docker.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ cd "${BUILD_DIR}"
179179
ctest --output-on-failure
180180

181181
# Run the integration tests.
182-
for subdir in bigtable storage; do
182+
for subdir in google/cloud/bigtable storage; do
183183
echo
184184
echo "Running integration tests for ${subdir}"
185185
/v/${subdir}/ci/run_integration_tests.sh

‎ci/build-jenkins.sh‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,45 @@ git submodule update --init --recursive
2020
cmake -DCMAKE_BUILD_TYPE=Release -H. -Bbuild-output
2121
cmake --build build-output -- -j $(nproc)
2222

23+
readonly PROJECT_ROOT=$(pwd)
24+
echo PROJECT_ROOT=${PROJECT_ROOT}
2325
cd build-output
2426
ctest --output-on-failure
2527

28+
readonly BTDIR="google/cloud/bigtable"
29+
2630
case ${BENCHMARK} in
2731
endurance)
28-
bigtable/benchmarks/endurance_benchmark ${PROJECT_ID} ${INSTANCE_ID} 4 82800;
32+
"${BTDIR}/benchmarks/endurance_benchmark" "${PROJECT_ID}" "${INSTANCE_ID}" 4 82800;
2933
;;
3034
latency)
31-
bigtable/benchmarks/apply_read_latency_benchmark ${PROJECT_ID} ${INSTANCE_ID};
35+
"${BTDIR}/benchmarks/apply_read_latency_benchmark" "${PROJECT_ID}" "${INSTANCE_ID}";
3236
;;
3337
throughput)
3438
# The magic number 64 here is the number of threads necessary to saturate the CPU
3539
# on a n1-standard-4 GCE instance (that is 4 vCPUs).
36-
bigtable/benchmarks/apply_read_latency_benchmark ${PROJECT_ID} ${INSTANCE_ID} 64 1800;
40+
"${BTDIR}/benchmarks/apply_read_latency_benchmark" "${PROJECT_ID}" "${INSTANCE_ID}" 64 1800;
3741
;;
3842
scan)
39-
bigtable/benchmarks/scan_throughput_benchmark ${PROJECT_ID} ${INSTANCE_ID} 1 1800;
43+
"${BTDIR}/benchmarks/scan_throughput_benchmark" "${PROJECT_ID}" "${INSTANCE_ID}" 1 1800;
4044
;;
4145
integration)
42-
(cd bigtable/tests && ../../../bigtable/tests/run_integration_tests_production.sh);
43-
(cd bigtable/examples && ../../../bigtable/examples/run_examples_production.sh);
46+
(cd "${BTDIR}/tests" && "${PROJECT_ROOT}/${BTDIR}/tests/run_integration_tests_production.sh");
47+
(cd "${BTDIR}/examples" && "${PROJECT_ROOT}/${BTDIR}/examples/run_examples_production.sh");
4448
;;
4549
# The following cases are used to test the script when making changes, they are not good
4650
# benchmarks.
4751
endurance-quick)
48-
bigtable/benchmarks/endurance_benchmark ${PROJECT_ID} ${INSTANCE_ID} 1 5 1000 true;
52+
"${BTDIR}/benchmarks/endurance_benchmark" "${PROJECT_ID}" "${INSTANCE_ID}" 1 5 1000 true;
4953
;;
5054
latency-quick)
51-
bigtable/benchmarks/apply_read_latency_benchmark ${PROJECT_ID} ${INSTANCE_ID} 1 5 1000 true;
55+
"${BTDIR}/benchmarks/apply_read_latency_benchmark" "${PROJECT_ID}" "${INSTANCE_ID}" 1 5 1000 true;
5256
;;
5357
throughput-quick)
54-
bigtable/benchmarks/apply_read_latency_benchmark ${PROJECT_ID} ${INSTANCE_ID} 1 5 1000 true;
58+
"${BTDIR}/benchmarks/apply_read_latency_benchmark" "${PROJECT_ID}" "${INSTANCE_ID}" 1 5 1000 true;
5559
;;
5660
scan-quick)
57-
bigtable/benchmarks/scan_throughput_benchmark ${PROJECT_ID} ${INSTANCE_ID} 1 5 1000 true;
61+
"${BTDIR}/benchmarks/scan_throughput_benchmark" "${PROJECT_ID}" "${INSTANCE_ID}" 1 5 1000 true;
5862
;;
5963
*)
6064
echo "Unknown benchmark type"

‎ci/check-style.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if [ "${CHECK_STYLE}" != "yes" ]; then
2121
exit 0
2222
fi
2323

24-
find google/cloud bigtable storage -name '*.h' -print0 \
24+
find google/cloud storage -name '*.h' -print0 \
2525
| xargs -0 awk 'BEGINFILE {
2626
# The guard must begin with the name of the project.
2727
guard_prefix="GOOGLE_CLOUD_CPP_"

‎ci/dump-logs.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
set -eu
1818

19-
# Dump the emulator log file. Tests run in the bigtable/tests directory.
19+
# Dump the emulator log file. Tests run in the google/cloud/bigtable/tests directory.
2020
echo "================ emulator.log ================"
21-
cat build-output/cached-${DISTRO}-${DISTRO_VERSION}/bigtable/tests/emulator.log >&2 || true
21+
cat build-output/cached-${DISTRO}-${DISTRO_VERSION}/google/cloud/bigtable/tests/emulator.log >&2 || true
2222
echo "================ instance-admin-emulator.log ================"
23-
cat build-output/cached-${DISTRO}-${DISTRO_VERSION}/bigtable/tests/instance-admin-emulator.log >&2 || true
23+
cat build-output/cached-${DISTRO}-${DISTRO_VERSION}/google/cloud/bigtable/tests/instance-admin-emulator.log >&2 || true

‎ci/kokoro/ubuntu/build.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ ctest --output-on-failure
4141
export GRPC_DEFAULT_SSL_ROOTS_FILE_PATH="${PROJECT_ROOT}/third_party/grpc/etc/roots.pem"
4242

4343
echo "Running Google Cloud Bigtable Integration Tests"
44-
(cd bigtable/tests && "${PROJECT_ROOT}/bigtable/tests/run_integration_tests_production.sh")
44+
(cd google/cloud/bigtable/tests && \
45+
"${PROJECT_ROOT}/google/cloud/bigtable/tests/run_integration_tests_production.sh")
4546

4647
echo "Running Google Cloud Storage Integration Tests"
4748
(cd storage/tests && "${PROJECT_ROOT}/storage/tests/run_integration_tests.sh")

‎ci/test-install/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ cc_binary(
2222
"install_integration_test.cc",
2323
],
2424
deps=[
25-
"@com_github_googlecloudplatform_google_cloud_cpp//bigtable/client:bigtable_client",
25+
"@com_github_googlecloudplatform_google_cloud_cpp//google/cloud/bigtable:bigtable_client",
2626
],
2727
)

0 commit comments

Comments
 (0)