feat(storage): use crc32c dep from abseil

Author: mpeddada1

google/cloud/storage/internal/crc32c.cc

@@ -14,22 +14,16 @@
 
 #include "google/cloud/storage/internal/crc32c.h"
 #include "absl/base/config.h"
-#if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION >= 20230125
 #include "absl/crc/crc32c.h"
-#define GOOGLE_CLOUD_CPP_USE_ABSL_CRC32C 1
-#else
-#define GOOGLE_CLOUD_CPP_USE_ABSL_CRC32C 0
-#endif  // ABSL_LTS_RELEASE_VERSION
-#include <crc32c/crc32c.h>
 
 namespace google {
 namespace cloud {
 namespace storage_internal {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
 std::uint32_t ExtendCrc32c(std::uint32_t crc, absl::string_view data) {
-  return crc32c::Extend(crc, reinterpret_cast<uint8_t const*>(data.data()),
-                        data.size());
+  return static_cast<std::uint32_t>(
+      absl::ExtendCrc32c(absl::crc32c_t{crc}, data));
 }
 
 std::uint32_t ExtendCrc32c(std::uint32_t crc,
@@ -47,8 +41,6 @@ std::uint32_t ExtendCrc32c(std::uint32_t crc, absl::Cord const& data) {
   return crc;
 }
 
-#if GOOGLE_CLOUD_CPP_USE_ABSL_CRC32C
-
 std::uint32_t ExtendCrc32c(std::uint32_t crc, absl::string_view data,
                            std::uint32_t data_crc) {
   return static_cast<std::uint32_t>(absl::ConcatCrc32c(
@@ -69,27 +61,7 @@ std::uint32_t ExtendCrc32c(std::uint32_t crc, absl::Cord const& data,
       absl::crc32c_t{crc}, absl::crc32c_t{data_crc}, data.size()));
 }
 
-#else
-
-std::uint32_t ExtendCrc32c(std::uint32_t crc, absl::string_view data,
-                           std::uint32_t /*data_crc*/) {
-  return ExtendCrc32c(crc, data);
-}
-
-std::uint32_t ExtendCrc32c(std::uint32_t crc,
-                           storage::internal::ConstBufferSequence const& data,
-                           std::uint32_t /*data_crc*/) {
-  return ExtendCrc32c(crc, data);
-}
-
-std::uint32_t ExtendCrc32c(std::uint32_t crc, absl::Cord const& data,
-                           std::uint32_t /*data_crc*/) {
-  return ExtendCrc32c(crc, data);
-}
-
-#endif  // GOOGLE_CLOUD_CPP_USE_ABSL_CRC32C
-
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace storage_internal
 }  // namespace cloud
-}  // namespace google
+}  // namespace google

google/cloud/storage/internal/crc32c.h

@@ -17,6 +17,7 @@
 
 #include "google/cloud/storage/internal/const_buffer.h"
 #include "google/cloud/storage/version.h"
+#include "absl/crc/crc32c.h"
 #include "absl/strings/cord.h"
 #include "absl/strings/string_view.h"
 #include <cstdint>
@@ -57,4 +58,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace cloud
 }  // namespace google
 
-#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_CRC32C_H
+#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_CRC32C_H

google/cloud/storage/internal/crc32c_benchmark.cc

@@ -13,8 +13,8 @@
 // limitations under the License.
 
 #include "google/cloud/storage/internal/crc32c.h"
+#include "absl/crc/crc32c.h"
 #include <benchmark/benchmark.h>
-#include <crc32c/crc32c.h>
 #include <string>
 
 namespace google {
@@ -33,31 +33,29 @@ namespace {
 // ----------------------------------------------------------------------
 // Benchmark                            Time             CPU   Iterations
 // ----------------------------------------------------------------------
-// BM_Crc32cDuplicateNonAbseil   25520759 ns     25520833 ns           28
+// BM_Crc32cExtendStringView     25520759 ns     25520833 ns           28
 // BM_Crc32cDuplicate            24168074 ns     24168122 ns           28
 // BM_Crc32cConcat               12213494 ns     12213077 ns           57
 
 auto constexpr kMessage = 2 * 1024 * std::size_t{1024};
 auto constexpr kWriteSize = 16 * kMessage;
 auto constexpr kUploadSize = 8 * kWriteSize;
 
-void BM_Crc32cDuplicateNonAbseil(benchmark::State& state) {
+void BM_Crc32cExtendStringView(benchmark::State& state) {
   auto buffer = std::string(kWriteSize, '0');
-  auto crc = std::uint32_t{0};
+  auto crc = absl::crc32c_t{0};
   for (auto _ : state) {
     for (std::size_t offset = 0; offset < kUploadSize; offset += kWriteSize) {
       for (std::size_t m = 0; m < kWriteSize; m += kMessage) {
         auto w = absl::string_view{buffer}.substr(m, kMessage);
-        benchmark::DoNotOptimize(crc32c::Crc32c(w.data(), w.size()));
+        benchmark::DoNotOptimize(absl::ComputeCrc32c(w));
       }
-      crc = crc32c::Extend(crc,
-                           reinterpret_cast<std::uint8_t const*>(buffer.data()),
-                           buffer.size());
+      crc = absl::ExtendCrc32c(crc, buffer);
     }
   }
   benchmark::DoNotOptimize(crc);
 }
-BENCHMARK(BM_Crc32cDuplicateNonAbseil);
+BENCHMARK(BM_Crc32cExtendStringView);
 
 void BM_Crc32cDuplicate(benchmark::State& state) {
   auto buffer = std::string(kWriteSize, '0');
@@ -95,4 +93,4 @@ BENCHMARK(BM_Crc32cConcat);
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace storage_internal
 }  // namespace cloud
-}  // namespace google
+}  // namespace google