From 11c03b9744432379e60b5f5c9ee4c13c4ce00e8b Mon Sep 17 00:00:00 2001 From: Neeraj Dwivedi Date: Fri, 8 May 2026 14:06:28 +0530 Subject: [PATCH 01/13] upgraded client lib and added needed changes --- bazel/deps.bzl | 31 +---- bazel/remove_upb_c_rules.patch | 124 ++++++++++++++++++ google/cloud/odbc/BUILD.bazel | 4 +- .../odbc/bq_client_interface/BUILD.bazel | 2 +- .../odbc/bq_client_interface/datasets.cc | 2 +- google/cloud/odbc/bq_client_interface/jobs.cc | 2 +- .../odbc_authentication.cc | 2 +- .../bq_client_interface/odbc_bq_client.cc | 2 +- .../odbc/bq_client_interface/projects.cc | 4 +- .../odbc/bq_client_interface/projects_test.cc | 2 +- .../cloud/odbc/bq_client_interface/storage.cc | 2 +- .../cloud/odbc/bq_client_interface/tables.cc | 2 +- google/cloud/odbc/bq_client_interface/utils.h | 2 +- .../odbc/bq_driver/internal/trace_utils.cc | 4 +- .../odbc/bq_driver/internal/trace_utils.h | 10 +- .../bq_driver/internal/trace_utils_test.cc | 2 +- .../cloud/odbc/integration_tests/BUILD.bazel | 2 +- .../bq_apis/insert_job_test.cc | 2 +- google/cloud/odbc/internal/BUILD.bazel | 2 +- .../testing/client_library_utils/BUILD.bazel | 2 +- .../client_library_utils/common_functions.cc | 2 +- .../cloud/odbc/testing/odbc_utils/BUILD.bazel | 2 +- google/cloud/odbc/testing/utils/BUILD.bazel | 2 +- 23 files changed, 155 insertions(+), 56 deletions(-) create mode 100644 bazel/remove_upb_c_rules.patch diff --git a/bazel/deps.bzl b/bazel/deps.bzl index 803415adf4..6b29346b98 100644 --- a/bazel/deps.bzl +++ b/bazel/deps.bzl @@ -29,31 +29,6 @@ def cpp_bigquery_odbc_development_deps(name = None): name: Unused. It is conventional to provide a `name` argument to all workspace functions. """ - - # Load a version of googletest that we know works. This is needed to create - # //:.*mocks targets, which are public. - maybe( - http_archive, - name = "com_google_googletest", - urls = [ - "https://github.com/google/googletest/archive/v1.15.2.tar.gz", - ], - sha256 = "7b42b4d6ed48810c5362c265a17faebe90dc2373c885e5216439d37927f02926", - strip_prefix = "googletest-1.15.2", - ) - - # Load rules_cc, used by googletest - maybe( - http_archive, - name = "rules_cc", - urls = [ - "https://storage.googleapis.com/cloud-cpp-community-archive/rules_cc/rules_cc-0.0.15.tar.gz", - "https://github.com/bazelbuild/rules_cc/releases/download/0.0.15/rules_cc-0.0.15.tar.gz", - ], - sha256 = "f4aadd8387f381033a9ad0500443a52a0cea5f8ad1ede4369d3c614eb7b2682e", - strip_prefix = "rules_cc-0.0.15", - ) - # Load Abseil maybe( http_archive, @@ -92,7 +67,7 @@ def cpp_bigquery_odbc_deps(name = None): http_archive, name = "com_google_cloud_cpp", urls = [ - "https://github.com/googleapis/google-cloud-cpp/archive/refs/tags/v2.47.0.tar.gz", + "https://github.com/googleapis/google-cloud-cpp/archive/refs/tags/v3.4.0.tar.gz", ], - strip_prefix = "google-cloud-cpp-2.47.0", - ) + strip_prefix = "google-cloud-cpp-3.4.0", + ) \ No newline at end of file diff --git a/bazel/remove_upb_c_rules.patch b/bazel/remove_upb_c_rules.patch new file mode 100644 index 0000000000..4bb73df856 --- /dev/null +++ b/bazel/remove_upb_c_rules.patch @@ -0,0 +1,124 @@ +diff --git google/api/expr/v1alpha1/BUILD.bazel google/api/expr/v1alpha1/BUILD.bazel +index 9bed46809..197e5249c 100644 +--- google/api/expr/v1alpha1/BUILD.bazel ++++ google/api/expr/v1alpha1/BUILD.bazel +@@ -233,32 +233,32 @@ cc_proto_library( + ############################################################################## + # upb + ############################################################################## +-load( +- "@com_google_googleapis_imports//:imports.bzl", +- "upb_c_proto_library", +-) +- +-upb_c_proto_library( +- name = "checked_upb_proto", +- deps = [":checked_proto"], +-) +- +-upb_c_proto_library( +- name = "eval_upb_proto", +- deps = [":eval_proto"], +-) +- +-upb_c_proto_library( +- name = "explain_upb_proto", +- deps = [":explain_proto"], +-) +- +-upb_c_proto_library( +- name = "syntax_upb_proto", +- deps = [":syntax_proto"], +-) +- +-upb_c_proto_library( +- name = "value_upb_proto", +- deps = [":value_proto"], +-) ++#load( ++ #"@com_google_googleapis_imports//:imports.bzl", ++ #"upb_c_proto_library", ++#) ++# ++#upb_c_proto_library( ++ #name = "checked_upb_proto", ++ #deps = [":checked_proto"], ++#) ++# ++#upb_c_proto_library( ++ #name = "eval_upb_proto", ++ #deps = [":eval_proto"], ++#) ++# ++#upb_c_proto_library( ++ #name = "explain_upb_proto", ++ #deps = [":explain_proto"], ++#) ++# ++#upb_c_proto_library( ++ #name = "syntax_upb_proto", ++ #deps = [":syntax_proto"], ++#) ++# ++#upb_c_proto_library( ++ #name = "value_upb_proto", ++ #deps = [":value_proto"], ++#) +diff --git google/rpc/BUILD.bazel google/rpc/BUILD.bazel +index 31fd6457d..c38f00c46 100644 +--- google/rpc/BUILD.bazel ++++ google/rpc/BUILD.bazel +@@ -11,7 +11,7 @@ load( + "php_proto_library", + "py_gapic_assembly_pkg", + "py_proto_library", +- "upb_c_proto_library", ++ #"upb_c_proto_library", + ) + load("@rules_proto//proto:defs.bzl", "proto_library") + +@@ -104,15 +104,15 @@ cc_proto_library( + deps = [":status_proto"], + ) + +-upb_c_proto_library( +- name = "code_upb_proto", +- deps = [":code_proto"], +-) ++#upb_c_proto_library( ++ #name = "code_upb_proto", ++ #deps = [":code_proto"], ++#) + +-upb_c_proto_library( +- name = "status_upb_proto", +- deps = [":status_proto"], +-) ++#upb_c_proto_library( ++ #name = "status_upb_proto", ++ #deps = [":status_proto"], ++#) + + py_proto_library( + name = "code_py_proto", +diff --git repository_rules.bzl repository_rules.bzl +index 2f87ad682..2ab3bd054 100644 +--- repository_rules.bzl ++++ repository_rules.bzl +@@ -224,11 +224,11 @@ def switched_rules_by_language( + # + # upb + # +- rules["upb_c_proto_library"] = _switch( +- upb, +- "@com_google_protobuf//bazel:upb_c_proto_library.bzl", +- "upb_c_proto_library", +- ) ++ #rules["upb_c_proto_library"] = _switch( ++ # upb, ++ # "@com_google_protobuf//bazel:upb_c_proto_library.bzl", ++ # "upb_c_proto_library", ++ #) + + # + # PHP \ No newline at end of file diff --git a/google/cloud/odbc/BUILD.bazel b/google/cloud/odbc/BUILD.bazel index 499c371d20..ae56cbf6c2 100644 --- a/google/cloud/odbc/BUILD.bazel +++ b/google/cloud/odbc/BUILD.bazel @@ -88,7 +88,7 @@ cc_test( deps = [ "//google/cloud/odbc/testing:google_cloud_odbc_testing_bq_driver_utils", "//google/cloud/odbc/testing:google_cloud_odbc_testing_utils", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) @@ -123,6 +123,6 @@ cc_test( deps = [ "//google/cloud/odbc/testing:google_cloud_odbc_testing_bq_driver_utils", "//google/cloud/odbc/testing:google_cloud_odbc_testing_utils", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) diff --git a/google/cloud/odbc/bq_client_interface/BUILD.bazel b/google/cloud/odbc/bq_client_interface/BUILD.bazel index c1536fb540..1f6355ef30 100644 --- a/google/cloud/odbc/bq_client_interface/BUILD.bazel +++ b/google/cloud/odbc/bq_client_interface/BUILD.bazel @@ -45,6 +45,6 @@ cc_library( "@com_google_cloud_cpp//:mocks", "@com_google_cloud_cpp//:resourcemanager_mocks", "@com_google_cloud_cpp//:serviceusage_mocks", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for bq_client_interface_test in glob(["*_test.cc"])] diff --git a/google/cloud/odbc/bq_client_interface/datasets.cc b/google/cloud/odbc/bq_client_interface/datasets.cc index 2a2c4a8ca5..834403ef66 100644 --- a/google/cloud/odbc/bq_client_interface/datasets.cc +++ b/google/cloud/odbc/bq_client_interface/datasets.cc @@ -15,7 +15,7 @@ #include "google/cloud/odbc/bq_client_interface/datasets.h" #include "google/cloud/odbc/internal/status_record_or.h" #include "google/cloud/bigquery/v2/minimal/internal/dataset_client.h" -#include +#include "absl/log/log.h" namespace google::cloud::odbc_bigquery_client_interface { diff --git a/google/cloud/odbc/bq_client_interface/jobs.cc b/google/cloud/odbc/bq_client_interface/jobs.cc index a46034feb5..b54eeab4f8 100644 --- a/google/cloud/odbc/bq_client_interface/jobs.cc +++ b/google/cloud/odbc/bq_client_interface/jobs.cc @@ -18,7 +18,7 @@ #include "google/cloud/odbc/internal/status_record_or.h" #include "google/cloud/bigquery/v2/minimal/internal/job_client.h" #include "google/cloud/bigquery/v2/minimal/internal/job_request.h" -#include +#include "absl/log/log.h" #include namespace google::cloud::odbc_bigquery_client_interface { diff --git a/google/cloud/odbc/bq_client_interface/odbc_authentication.cc b/google/cloud/odbc/bq_client_interface/odbc_authentication.cc index cb101a9e82..b8c1d7aa92 100644 --- a/google/cloud/odbc/bq_client_interface/odbc_authentication.cc +++ b/google/cloud/odbc/bq_client_interface/odbc_authentication.cc @@ -20,7 +20,7 @@ #include "google/cloud/internal/getenv.h" #include "google/cloud/oauth2/access_token_generator.h" #include "google/cloud/status_or.h" -#include +#include "absl/log/log.h" #include #include namespace google::cloud::odbc_bigquery_client_interface { diff --git a/google/cloud/odbc/bq_client_interface/odbc_bq_client.cc b/google/cloud/odbc/bq_client_interface/odbc_bq_client.cc index bf95996ca5..b3184c7a7b 100644 --- a/google/cloud/odbc/bq_client_interface/odbc_bq_client.cc +++ b/google/cloud/odbc/bq_client_interface/odbc_bq_client.cc @@ -25,7 +25,7 @@ #include "google/cloud/credentials.h" #include "google/cloud/grpc_options.h" #include "google/cloud/universe_domain_options.h" -#include +#include "absl/log/log.h" #include #include diff --git a/google/cloud/odbc/bq_client_interface/projects.cc b/google/cloud/odbc/bq_client_interface/projects.cc index eb34fe472b..d21cdc2422 100644 --- a/google/cloud/odbc/bq_client_interface/projects.cc +++ b/google/cloud/odbc/bq_client_interface/projects.cc @@ -16,8 +16,8 @@ #include "google/cloud/odbc/bq_client_interface/datasets.h" #include "google/cloud/odbc/internal/sql_state_constants.h" #include "google/cloud/odbc/internal/status_record_or.h" -#include -#include +#include "google/cloud/resourcemanager/v3/projects.pb.h" +#include "absl/log/log.h" namespace google::cloud::odbc_bigquery_client_interface { diff --git a/google/cloud/odbc/bq_client_interface/projects_test.cc b/google/cloud/odbc/bq_client_interface/projects_test.cc index 40dec62583..8f0556e474 100644 --- a/google/cloud/odbc/bq_client_interface/projects_test.cc +++ b/google/cloud/odbc/bq_client_interface/projects_test.cc @@ -20,7 +20,7 @@ #include "google/cloud/resourcemanager/v3/mocks/mock_projects_connection.h" #include "google/cloud/resourcemanager/v3/projects_client.h" #include "google/cloud/serviceusage/v1/mocks/mock_service_usage_connection.h" -#include +#include "google/cloud/resourcemanager/v3/projects.pb.h" #include namespace google::cloud::odbc_bigquery_client_interface { diff --git a/google/cloud/odbc/bq_client_interface/storage.cc b/google/cloud/odbc/bq_client_interface/storage.cc index e53cc6d6fd..4fe29a8aa0 100644 --- a/google/cloud/odbc/bq_client_interface/storage.cc +++ b/google/cloud/odbc/bq_client_interface/storage.cc @@ -14,7 +14,7 @@ #include "google/cloud/odbc/internal/status_record_or.h" #include "google/cloud/bigquery/storage/v1/bigquery_read_client.h" -#include +#include "absl/log/log.h" namespace google::cloud::odbc_bigquery_client_interface { diff --git a/google/cloud/odbc/bq_client_interface/tables.cc b/google/cloud/odbc/bq_client_interface/tables.cc index ee02867632..d51903cb0c 100644 --- a/google/cloud/odbc/bq_client_interface/tables.cc +++ b/google/cloud/odbc/bq_client_interface/tables.cc @@ -17,7 +17,7 @@ #include "google/cloud/odbc/bq_client_interface/utils.h" #include "google/cloud/odbc/internal/status_record_or.h" #include "google/cloud/bigquery/v2/minimal/internal/table_client.h" -#include +#include "absl/log/log.h" namespace google::cloud::odbc_bigquery_client_interface { diff --git a/google/cloud/odbc/bq_client_interface/utils.h b/google/cloud/odbc/bq_client_interface/utils.h index 072f1a673d..60ae235e9c 100644 --- a/google/cloud/odbc/bq_client_interface/utils.h +++ b/google/cloud/odbc/bq_client_interface/utils.h @@ -15,7 +15,7 @@ #ifndef CPP_BIGQUERY_ODBC_GOOGLE_CLOUD_ODBC_BQ_CLIENT_INTERFACE_UTILS_H #define CPP_BIGQUERY_ODBC_GOOGLE_CLOUD_ODBC_BQ_CLIENT_INTERFACE_UTILS_H -#include +#include "absl/log/log.h" #include #include #include diff --git a/google/cloud/odbc/bq_driver/internal/trace_utils.cc b/google/cloud/odbc/bq_driver/internal/trace_utils.cc index cbbd0a0730..9d9ee8aded 100644 --- a/google/cloud/odbc/bq_driver/internal/trace_utils.cc +++ b/google/cloud/odbc/bq_driver/internal/trace_utils.cc @@ -13,8 +13,8 @@ // limitations under the License. #include "google/cloud/odbc/bq_driver/internal/trace_utils.h" -#include -#include +#include "absl/log/internal/globals.h" +#include "absl/strings/str_format.h" #include namespace google::cloud::odbc_bq_driver_internal { diff --git a/google/cloud/odbc/bq_driver/internal/trace_utils.h b/google/cloud/odbc/bq_driver/internal/trace_utils.h index a6ba839f72..6124b12495 100644 --- a/google/cloud/odbc/bq_driver/internal/trace_utils.h +++ b/google/cloud/odbc/bq_driver/internal/trace_utils.h @@ -18,11 +18,11 @@ #include "google/cloud/odbc/bq_driver/internal/utils.h" #include "google/cloud/odbc/internal/odbc_includes.h" #include "google/cloud/odbc/internal/status_record_or.h" -#include -#include -#include -#include -#include +#include "absl/log/globals.h" +#include "absl/log/initialize.h" +#include "absl/log/internal/log_sink_set.h" +#include "absl/log/log.h" +#include "absl/log/log_sink.h" #include #include #include diff --git a/google/cloud/odbc/bq_driver/internal/trace_utils_test.cc b/google/cloud/odbc/bq_driver/internal/trace_utils_test.cc index d75e3b3227..089820e081 100644 --- a/google/cloud/odbc/bq_driver/internal/trace_utils_test.cc +++ b/google/cloud/odbc/bq_driver/internal/trace_utils_test.cc @@ -15,7 +15,7 @@ #include "google/cloud/odbc/bq_driver/internal/trace_utils.h" #include "google/cloud/odbc/testing/utils/status_matchers.h" #include "google/cloud/internal/getenv.h" -#include +#include "absl/strings/str_format.h" #include namespace google::cloud::odbc_bq_driver_internal { diff --git a/google/cloud/odbc/integration_tests/BUILD.bazel b/google/cloud/odbc/integration_tests/BUILD.bazel index 23e82170f4..54b714829b 100644 --- a/google/cloud/odbc/integration_tests/BUILD.bazel +++ b/google/cloud/odbc/integration_tests/BUILD.bazel @@ -28,6 +28,6 @@ licenses(["notice"]) # Apache 2.0 "@com_google_cloud_cpp//:experimental-bigquery-rest", "@com_google_cloud_cpp//:resourcemanager", "@com_google_cloud_cpp//:serviceusage", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for api_test in glob(["bq_apis/*.cc"])] diff --git a/google/cloud/odbc/integration_tests/bq_apis/insert_job_test.cc b/google/cloud/odbc/integration_tests/bq_apis/insert_job_test.cc index fb3899d55f..0c1e735741 100644 --- a/google/cloud/odbc/integration_tests/bq_apis/insert_job_test.cc +++ b/google/cloud/odbc/integration_tests/bq_apis/insert_job_test.cc @@ -19,7 +19,7 @@ #include "google/cloud/odbc/testing/utils/env_vars.h" #include "google/cloud/odbc/testing/utils/status_matchers.h" #include "google/cloud/bigquery/v2/minimal/internal/job_client.h" -#include "google/cloud/internal/absl_str_cat_quiet.h" +#include "absl/strings/str_cat.h" #include namespace google::cloud::odbc_integration_tests_apis { diff --git a/google/cloud/odbc/internal/BUILD.bazel b/google/cloud/odbc/internal/BUILD.bazel index 87c681ff6a..75a41e3b54 100644 --- a/google/cloud/odbc/internal/BUILD.bazel +++ b/google/cloud/odbc/internal/BUILD.bazel @@ -46,6 +46,6 @@ cc_library( tags = ["unit-tests"], deps = [ "//:odbc_internal", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) for odbc_internal_test in glob(["*_test.cc"])] diff --git a/google/cloud/odbc/testing/client_library_utils/BUILD.bazel b/google/cloud/odbc/testing/client_library_utils/BUILD.bazel index cb0d835e89..6e188f6f9b 100644 --- a/google/cloud/odbc/testing/client_library_utils/BUILD.bazel +++ b/google/cloud/odbc/testing/client_library_utils/BUILD.bazel @@ -27,6 +27,6 @@ cc_library( deps = [ "//google/cloud/odbc/bq_client_interface:odbc_bq_client_interface", "@com_google_cloud_cpp//:experimental-bigquery-rest", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) diff --git a/google/cloud/odbc/testing/client_library_utils/common_functions.cc b/google/cloud/odbc/testing/client_library_utils/common_functions.cc index 78d8826763..27c3618f7f 100644 --- a/google/cloud/odbc/testing/client_library_utils/common_functions.cc +++ b/google/cloud/odbc/testing/client_library_utils/common_functions.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "google/cloud/bigquery/v2/minimal/internal/job_client.h" -#include "google/cloud/internal/absl_str_cat_quiet.h" +#include "absl/strings/str_cat.h" #include "google/cloud/internal/getenv.h" #include diff --git a/google/cloud/odbc/testing/odbc_utils/BUILD.bazel b/google/cloud/odbc/testing/odbc_utils/BUILD.bazel index ccad8ce455..3e74c58c3a 100644 --- a/google/cloud/odbc/testing/odbc_utils/BUILD.bazel +++ b/google/cloud/odbc/testing/odbc_utils/BUILD.bazel @@ -26,6 +26,6 @@ cc_library( visibility = ["//visibility:public"], deps = [ "@com_google_cloud_cpp//:experimental-bigquery-rest", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) diff --git a/google/cloud/odbc/testing/utils/BUILD.bazel b/google/cloud/odbc/testing/utils/BUILD.bazel index 002c3c96ab..1767c6dfd8 100644 --- a/google/cloud/odbc/testing/utils/BUILD.bazel +++ b/google/cloud/odbc/testing/utils/BUILD.bazel @@ -26,6 +26,6 @@ cc_library( visibility = ["//visibility:public"], deps = [ "@com_google_cloud_cpp//:experimental-bigquery-rest", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) From 235c2be4ed25fa7d561ad83ad3bdd70694a36b88 Mon Sep 17 00:00:00 2001 From: Neeraj Dwivedi Date: Fri, 8 May 2026 14:39:09 +0530 Subject: [PATCH 02/13] updated abseil version --- bazel/deps.bzl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bazel/deps.bzl b/bazel/deps.bzl index 6b29346b98..9f7e4c9ae6 100644 --- a/bazel/deps.bzl +++ b/bazel/deps.bzl @@ -33,11 +33,11 @@ def cpp_bigquery_odbc_development_deps(name = None): maybe( http_archive, name = "com_google_absl", - urls = [ - "https://github.com/abseil/abseil-cpp/archive/20240722.0.tar.gz", + urls = [ + "https://github.com/abseil/abseil-cpp/archive/20250512.2.tar.gz", ], - sha256 = "f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3", - strip_prefix = "abseil-cpp-20240722.0", + sha256 = "71358f2e72e945d280bfab44090eacb3f98e10fead31fd97876f05a835510d92", + strip_prefix = "abseil-cpp-20250512.2", ) def cpp_bigquery_odbc_deps(name = None): From 8536846c20b88494c9f7b60bf4ef6942d423e341 Mon Sep 17 00:00:00 2001 From: Neeraj Dwivedi Date: Fri, 8 May 2026 15:32:01 +0530 Subject: [PATCH 03/13] adding rep mapping of opentelemetry --- bazel/deps.bzl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/bazel/deps.bzl b/bazel/deps.bzl index 9f7e4c9ae6..16f9c18de3 100644 --- a/bazel/deps.bzl +++ b/bazel/deps.bzl @@ -40,6 +40,19 @@ def cpp_bigquery_odbc_development_deps(name = None): strip_prefix = "abseil-cpp-20250512.2", ) + http_archive( + name = "opentelemetry-cpp", + urls = [ + "https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz", + ], + sha256 = "4b6eeb852f075133c21b95948017f13a3e21740e55b921d27e42970a47314297", + strip_prefix = "opentelemetry-cpp-1.20.0", + repo_mapping = { + "@com_google_absl": "@abseil-cpp", # <-- THIS is the fix + }, + ) + + def cpp_bigquery_odbc_deps(name = None): """Loads dependencies need to compile the cpp-bigquery-odbc libraries. From acd3f2b8e333892efd759015c7e38e64fc46c8b8 Mon Sep 17 00:00:00 2001 From: Neeraj Dwivedi Date: Fri, 8 May 2026 16:05:13 +0530 Subject: [PATCH 04/13] test --- bazel/deps.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/deps.bzl b/bazel/deps.bzl index 16f9c18de3..ee42390e47 100644 --- a/bazel/deps.bzl +++ b/bazel/deps.bzl @@ -32,7 +32,7 @@ def cpp_bigquery_odbc_development_deps(name = None): # Load Abseil maybe( http_archive, - name = "com_google_absl", + name = "abseil-cpp", urls = [ "https://github.com/abseil/abseil-cpp/archive/20250512.2.tar.gz", ], From 2de7ca6a94f8cd52535ab366da8e0a50da29c12e Mon Sep 17 00:00:00 2001 From: Neeraj Dwivedi Date: Mon, 11 May 2026 10:42:29 +0530 Subject: [PATCH 05/13] test overriding --- bazel/deps.bzl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bazel/deps.bzl b/bazel/deps.bzl index ee42390e47..482121b2ad 100644 --- a/bazel/deps.bzl +++ b/bazel/deps.bzl @@ -33,22 +33,23 @@ def cpp_bigquery_odbc_development_deps(name = None): maybe( http_archive, name = "abseil-cpp", - urls = [ + urls = [ "https://github.com/abseil/abseil-cpp/archive/20250512.2.tar.gz", ], sha256 = "71358f2e72e945d280bfab44090eacb3f98e10fead31fd97876f05a835510d92", strip_prefix = "abseil-cpp-20250512.2", ) - http_archive( + maybe( + http_archive, name = "opentelemetry-cpp", - urls = [ + urls = [ "https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz", ], sha256 = "4b6eeb852f075133c21b95948017f13a3e21740e55b921d27e42970a47314297", strip_prefix = "opentelemetry-cpp-1.20.0", repo_mapping = { - "@com_google_absl": "@abseil-cpp", # <-- THIS is the fix + "@com_google_absl": "@abseil-cpp", }, ) From b86a8d6bcda20cab1e616f96cd9d6f3f50cc7789 Mon Sep 17 00:00:00 2001 From: Neeraj Dwivedi Date: Mon, 11 May 2026 11:02:47 +0530 Subject: [PATCH 06/13] added mapping --- google/cloud/odbc/BUILD.bazel | 2 ++ 1 file changed, 2 insertions(+) diff --git a/google/cloud/odbc/BUILD.bazel b/google/cloud/odbc/BUILD.bazel index ae56cbf6c2..f8d4c1fe70 100644 --- a/google/cloud/odbc/BUILD.bazel +++ b/google/cloud/odbc/BUILD.bazel @@ -88,6 +88,7 @@ cc_test( deps = [ "//google/cloud/odbc/testing:google_cloud_odbc_testing_bq_driver_utils", "//google/cloud/odbc/testing:google_cloud_odbc_testing_utils", + "@com_google_absl//absl/time/internal/cctz:time_zone", "@googletest//:gtest_main", ], ) @@ -123,6 +124,7 @@ cc_test( deps = [ "//google/cloud/odbc/testing:google_cloud_odbc_testing_bq_driver_utils", "//google/cloud/odbc/testing:google_cloud_odbc_testing_utils", + "@com_google_absl//absl/time/internal/cctz:time_zone", "@googletest//:gtest_main", ], ) From 056d48249bfa3f9c9ca77926fa9f3b30e1b55d50 Mon Sep 17 00:00:00 2001 From: Neeraj Dwivedi Date: Mon, 11 May 2026 11:11:37 +0530 Subject: [PATCH 07/13] test --- google/cloud/odbc/BUILD.bazel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/google/cloud/odbc/BUILD.bazel b/google/cloud/odbc/BUILD.bazel index f8d4c1fe70..6d165a84df 100644 --- a/google/cloud/odbc/BUILD.bazel +++ b/google/cloud/odbc/BUILD.bazel @@ -88,7 +88,7 @@ cc_test( deps = [ "//google/cloud/odbc/testing:google_cloud_odbc_testing_bq_driver_utils", "//google/cloud/odbc/testing:google_cloud_odbc_testing_utils", - "@com_google_absl//absl/time/internal/cctz:time_zone", + "@abseil-cpp//absl/time/internal/cctz:time_zone", "@googletest//:gtest_main", ], ) @@ -124,7 +124,7 @@ cc_test( deps = [ "//google/cloud/odbc/testing:google_cloud_odbc_testing_bq_driver_utils", "//google/cloud/odbc/testing:google_cloud_odbc_testing_utils", - "@com_google_absl//absl/time/internal/cctz:time_zone", + "@abseil-cpp//absl/time/internal/cctz:time_zone", "@googletest//:gtest_main", ], ) From bfa20a28d2ea5f4b282f6e9a37f2755ccd6b877f Mon Sep 17 00:00:00 2001 From: Neeraj Dwivedi Date: Mon, 11 May 2026 12:13:05 +0530 Subject: [PATCH 08/13] temp chnages test --- bazel/deps.bzl | 26 +++----------------------- google/cloud/odbc/BUILD.bazel | 6 ++++-- 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/bazel/deps.bzl b/bazel/deps.bzl index 482121b2ad..bc69a2ee6d 100644 --- a/bazel/deps.bzl +++ b/bazel/deps.bzl @@ -30,29 +30,6 @@ def cpp_bigquery_odbc_development_deps(name = None): workspace functions. """ # Load Abseil - maybe( - http_archive, - name = "abseil-cpp", - urls = [ - "https://github.com/abseil/abseil-cpp/archive/20250512.2.tar.gz", - ], - sha256 = "71358f2e72e945d280bfab44090eacb3f98e10fead31fd97876f05a835510d92", - strip_prefix = "abseil-cpp-20250512.2", - ) - - maybe( - http_archive, - name = "opentelemetry-cpp", - urls = [ - "https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz", - ], - sha256 = "4b6eeb852f075133c21b95948017f13a3e21740e55b921d27e42970a47314297", - strip_prefix = "opentelemetry-cpp-1.20.0", - repo_mapping = { - "@com_google_absl": "@abseil-cpp", - }, - ) - def cpp_bigquery_odbc_deps(name = None): """Loads dependencies need to compile the cpp-bigquery-odbc libraries. @@ -84,4 +61,7 @@ def cpp_bigquery_odbc_deps(name = None): "https://github.com/googleapis/google-cloud-cpp/archive/refs/tags/v3.4.0.tar.gz", ], strip_prefix = "google-cloud-cpp-3.4.0", + repo_mapping = { + "@com_google_absl": "@abseil-cpp", + }, ) \ No newline at end of file diff --git a/google/cloud/odbc/BUILD.bazel b/google/cloud/odbc/BUILD.bazel index 6d165a84df..d7d7ab0150 100644 --- a/google/cloud/odbc/BUILD.bazel +++ b/google/cloud/odbc/BUILD.bazel @@ -88,7 +88,8 @@ cc_test( deps = [ "//google/cloud/odbc/testing:google_cloud_odbc_testing_bq_driver_utils", "//google/cloud/odbc/testing:google_cloud_odbc_testing_utils", - "@abseil-cpp//absl/time/internal/cctz:time_zone", + "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/time/internal/cctz:time_zone", "@googletest//:gtest_main", ], ) @@ -124,7 +125,8 @@ cc_test( deps = [ "//google/cloud/odbc/testing:google_cloud_odbc_testing_bq_driver_utils", "//google/cloud/odbc/testing:google_cloud_odbc_testing_utils", - "@abseil-cpp//absl/time/internal/cctz:time_zone", + "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/time/internal/cctz:time_zone", "@googletest//:gtest_main", ], ) From 2764efe0b5696da1733aa99308012921f92190a1 Mon Sep 17 00:00:00 2001 From: Neeraj Dwivedi Date: Mon, 11 May 2026 12:46:18 +0530 Subject: [PATCH 09/13] new chnages --- bazel/deps.bzl | 23 +++++++++++++++++++++++ google/cloud/odbc/BUILD.bazel | 32 +++++++++++++++++++++----------- 2 files changed, 44 insertions(+), 11 deletions(-) diff --git a/bazel/deps.bzl b/bazel/deps.bzl index bc69a2ee6d..b25e475c5f 100644 --- a/bazel/deps.bzl +++ b/bazel/deps.bzl @@ -30,6 +30,29 @@ def cpp_bigquery_odbc_development_deps(name = None): workspace functions. """ # Load Abseil + maybe( + http_archive, + name = "com_google_absl", + urls = [ + "https://github.com/abseil/abseil-cpp/archive/20250512.2.tar.gz", + ], + sha256 = "71358f2e72e945d280bfab44090eacb3f98e10fead31fd97876f05a835510d92", + strip_prefix = "abseil-cpp-20250512.2", + ) + + maybe( + http_archive, + name = "opentelemetry-cpp", + urls = [ + "https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz", + ], + sha256 = "4b6eeb852f075133c21b95948017f13a3e21740e55b921d27e42970a47314297", + strip_prefix = "opentelemetry-cpp-1.20.0", + repo_mapping = { + "@com_google_absl": "@abseil-cpp", + }, + ) + def cpp_bigquery_odbc_deps(name = None): """Loads dependencies need to compile the cpp-bigquery-odbc libraries. diff --git a/google/cloud/odbc/BUILD.bazel b/google/cloud/odbc/BUILD.bazel index d7d7ab0150..0f66bf8c3e 100644 --- a/google/cloud/odbc/BUILD.bazel +++ b/google/cloud/odbc/BUILD.bazel @@ -52,13 +52,13 @@ cc_library( deps = [ "//google/cloud/odbc/bq_client_interface:odbc_bq_client_interface", "//google/cloud/odbc/internal:odbc_internal", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/log", - "@com_google_absl//absl/log:initialize", - "@com_google_absl//absl/log:log_sink", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", - "@com_google_absl//absl/time/internal/cctz:time_zone", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/log", + "@abseil-cpp//absl/log:initialize", + "@abseil-cpp//absl/log:log_sink", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/time", + "@abseil-cpp//absl/time/internal/cctz:time_zone", "@com_google_cloud_cpp//:experimental-bigquery-rest", # We need this dependency to use 'options' from client libraries ], ) @@ -88,8 +88,13 @@ cc_test( deps = [ "//google/cloud/odbc/testing:google_cloud_odbc_testing_bq_driver_utils", "//google/cloud/odbc/testing:google_cloud_odbc_testing_utils", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/time/internal/cctz:time_zone", +"@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/log", + "@abseil-cpp//absl/log:initialize", + "@abseil-cpp//absl/log:log_sink", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/time", + "@abseil-cpp//absl/time/internal/cctz:time_zone", "@googletest//:gtest_main", ], ) @@ -125,8 +130,13 @@ cc_test( deps = [ "//google/cloud/odbc/testing:google_cloud_odbc_testing_bq_driver_utils", "//google/cloud/odbc/testing:google_cloud_odbc_testing_utils", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/time/internal/cctz:time_zone", + "@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/log", + "@abseil-cpp//absl/log:initialize", + "@abseil-cpp//absl/log:log_sink", + "@abseil-cpp//absl/strings", + "@abseil-cpp//absl/time", + "@abseil-cpp//absl/time/internal/cctz:time_zone", "@googletest//:gtest_main", ], ) From 0f17363cab186540e63aff789252e12ea4ce480f Mon Sep 17 00:00:00 2001 From: Neeraj Dwivedi Date: Mon, 11 May 2026 13:31:36 +0530 Subject: [PATCH 10/13] test --- bazel/deps.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/deps.bzl b/bazel/deps.bzl index b25e475c5f..1db6c92d19 100644 --- a/bazel/deps.bzl +++ b/bazel/deps.bzl @@ -30,7 +30,7 @@ def cpp_bigquery_odbc_development_deps(name = None): workspace functions. """ # Load Abseil - maybe( + maybe( http_archive, name = "com_google_absl", urls = [ From 984cb0f86b8e790970bac6b77c8a9bed60ae50ef Mon Sep 17 00:00:00 2001 From: Neeraj Dwivedi Date: Mon, 11 May 2026 13:41:52 +0530 Subject: [PATCH 11/13] test --- bazel/deps.bzl | 3 --- google/cloud/odbc/BUILD.bazel | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/bazel/deps.bzl b/bazel/deps.bzl index 1db6c92d19..9c15fc1494 100644 --- a/bazel/deps.bzl +++ b/bazel/deps.bzl @@ -84,7 +84,4 @@ def cpp_bigquery_odbc_deps(name = None): "https://github.com/googleapis/google-cloud-cpp/archive/refs/tags/v3.4.0.tar.gz", ], strip_prefix = "google-cloud-cpp-3.4.0", - repo_mapping = { - "@com_google_absl": "@abseil-cpp", - }, ) \ No newline at end of file diff --git a/google/cloud/odbc/BUILD.bazel b/google/cloud/odbc/BUILD.bazel index 0f66bf8c3e..562c3901fa 100644 --- a/google/cloud/odbc/BUILD.bazel +++ b/google/cloud/odbc/BUILD.bazel @@ -88,7 +88,7 @@ cc_test( deps = [ "//google/cloud/odbc/testing:google_cloud_odbc_testing_bq_driver_utils", "//google/cloud/odbc/testing:google_cloud_odbc_testing_utils", -"@abseil-cpp//absl/base:core_headers", + "@abseil-cpp//absl/base:core_headers", "@abseil-cpp//absl/log", "@abseil-cpp//absl/log:initialize", "@abseil-cpp//absl/log:log_sink", From 6cc834d97553686a93e02ae2d8d8a18494b0df8b Mon Sep 17 00:00:00 2001 From: Neeraj Dwivedi Date: Mon, 11 May 2026 13:49:58 +0530 Subject: [PATCH 12/13] tesyt --- bazel/deps.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazel/deps.bzl b/bazel/deps.bzl index 9c15fc1494..482121b2ad 100644 --- a/bazel/deps.bzl +++ b/bazel/deps.bzl @@ -32,7 +32,7 @@ def cpp_bigquery_odbc_development_deps(name = None): # Load Abseil maybe( http_archive, - name = "com_google_absl", + name = "abseil-cpp", urls = [ "https://github.com/abseil/abseil-cpp/archive/20250512.2.tar.gz", ], From 10bed221800bb1208a939906a87424bd1363165b Mon Sep 17 00:00:00 2001 From: Neeraj Dwivedi Date: Wed, 13 May 2026 10:53:42 +0530 Subject: [PATCH 13/13] new changes with client lib --- bazel/deps.bzl | 8 ++++++-- ...remove_upb_c_rules.patch => remove_upb_c_ruless.patch} | 0 2 files changed, 6 insertions(+), 2 deletions(-) rename bazel/{remove_upb_c_rules.patch => remove_upb_c_ruless.patch} (100%) diff --git a/bazel/deps.bzl b/bazel/deps.bzl index 482121b2ad..5f1430f24e 100644 --- a/bazel/deps.bzl +++ b/bazel/deps.bzl @@ -81,7 +81,11 @@ def cpp_bigquery_odbc_deps(name = None): http_archive, name = "com_google_cloud_cpp", urls = [ - "https://github.com/googleapis/google-cloud-cpp/archive/refs/tags/v3.4.0.tar.gz", + # "https://github.com/googleapis/google-cloud-cpp/archive/refs/tags/v3.4.0.tar.gz", + + "https://github.com/NeerajDwivedii/google-cloud-cpp/archive/refs/heads/fix_patch_path_issue.tar.gz", + ], - strip_prefix = "google-cloud-cpp-3.4.0", + sha256 = "5473d9f10e02afab96a5893cb05f8e4f13ba53fbefb8c88aac13b4ec0ff79bab", + strip_prefix = "google-cloud-cpp-fix_patch_path_issue", ) \ No newline at end of file diff --git a/bazel/remove_upb_c_rules.patch b/bazel/remove_upb_c_ruless.patch similarity index 100% rename from bazel/remove_upb_c_rules.patch rename to bazel/remove_upb_c_ruless.patch