Skip to content

Commit 67042df

Browse files
v-pratapv-pratap
committed
storage: remove kCrc32cAndMD5 enum variant
1 parent 52f177f commit 67042df

9 files changed

Lines changed: 17 additions & 41 deletions

‎google/cloud/storage/benchmarks/throughput_experiment.cc‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ class ResumableUpload : public ThroughputExperiment {
8585
bucket_name, object_name,
8686
google::cloud::Options{}.set<gcs::UploadChecksumValidationOption>(
8787
config.enable_crc32c
88-
? (config.enable_md5 ? gcs::ChecksumAlgorithm::kCrc32cAndMD5
89-
: gcs::ChecksumAlgorithm::kCrc32c)
88+
? gcs::ChecksumAlgorithm::kCrc32c
9089
: (config.enable_md5 ? gcs::ChecksumAlgorithm::kMD5
9190
: gcs::ChecksumAlgorithm::kNone)));
9291
auto upload_id = ExtractUploadId(writer.resumable_session_id());
@@ -161,8 +160,7 @@ class SimpleUpload : public ThroughputExperiment {
161160
bucket_name, object_name, data,
162161
google::cloud::Options{}.set<gcs::UploadChecksumValidationOption>(
163162
config.enable_crc32c
164-
? (config.enable_md5 ? gcs::ChecksumAlgorithm::kCrc32cAndMD5
165-
: gcs::ChecksumAlgorithm::kCrc32c)
163+
? gcs::ChecksumAlgorithm::kCrc32c
166164
: (config.enable_md5 ? gcs::ChecksumAlgorithm::kMD5
167165
: gcs::ChecksumAlgorithm::kNone)));
168166
auto const usage = timer.Sample();
@@ -224,8 +222,7 @@ class DownloadObject : public ThroughputExperiment {
224222
bucket_name, object_name, read_range,
225223
google::cloud::Options{}.set<gcs::DownloadChecksumValidationOption>(
226224
config.enable_crc32c
227-
? (config.enable_md5 ? gcs::ChecksumAlgorithm::kCrc32cAndMD5
228-
: gcs::ChecksumAlgorithm::kCrc32c)
225+
? gcs::ChecksumAlgorithm::kCrc32c
229226
: (config.enable_md5 ? gcs::ChecksumAlgorithm::kMD5
230227
: gcs::ChecksumAlgorithm::kNone)));
231228
std::int64_t transfer_size = 0;

‎google/cloud/storage/internal/checksum_helpers.h‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@ inline HashDisabled GetDownloadChecksumSettings(Options const& options) {
3636
bool disable_crc32c = false;
3737
if (options.has<DownloadChecksumValidationOption>()) {
3838
auto const algo = options.get<DownloadChecksumValidationOption>();
39-
disable_md5 = (algo != ChecksumAlgorithm::kMD5 &&
40-
algo != ChecksumAlgorithm::kCrc32cAndMD5);
41-
disable_crc32c = (algo != ChecksumAlgorithm::kCrc32c &&
42-
algo != ChecksumAlgorithm::kCrc32cAndMD5);
39+
disable_md5 = (algo != ChecksumAlgorithm::kMD5);
40+
disable_crc32c = (algo != ChecksumAlgorithm::kCrc32c);
4341
}
4442

4543

@@ -51,10 +49,8 @@ inline HashDisabled GetUploadChecksumSettings(Options const& options) {
5149
bool disable_crc32c = false;
5250
if (options.has<UploadChecksumValidationOption>()) {
5351
auto const algo = options.get<UploadChecksumValidationOption>();
54-
disable_md5 = (algo != ChecksumAlgorithm::kMD5 &&
55-
algo != ChecksumAlgorithm::kCrc32cAndMD5);
56-
disable_crc32c = (algo != ChecksumAlgorithm::kCrc32c &&
57-
algo != ChecksumAlgorithm::kCrc32cAndMD5);
52+
disable_md5 = (algo != ChecksumAlgorithm::kMD5);
53+
disable_crc32c = (algo != ChecksumAlgorithm::kCrc32c);
5854
}
5955

6056

‎google/cloud/storage/internal/checksum_helpers_test.cc‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,7 @@ TEST(ChecksumHelpersTest, DownloadChecksumSettingsOnlyNewOptions) {
5050
EXPECT_TRUE(settings.md5);
5151
EXPECT_TRUE(settings.crc32c);
5252

53-
settings = GetDownloadChecksumSettings(
54-
request, Options{}.set<DownloadChecksumValidationOption>(
55-
ChecksumAlgorithm::kCrc32cAndMD5));
56-
EXPECT_FALSE(settings.md5);
57-
EXPECT_FALSE(settings.crc32c);
53+
5854
}
5955

6056
TEST(ChecksumHelpersTest, DownloadChecksumSettingsOnlyOldOptions) {
@@ -126,11 +122,7 @@ TEST(ChecksumHelpersTest, UploadChecksumSettingsOnlyNewOptions) {
126122
EXPECT_TRUE(settings.md5);
127123
EXPECT_TRUE(settings.crc32c);
128124

129-
settings = GetUploadChecksumSettings(
130-
request, Options{}.set<UploadChecksumValidationOption>(
131-
ChecksumAlgorithm::kCrc32cAndMD5));
132-
EXPECT_FALSE(settings.md5);
133-
EXPECT_FALSE(settings.crc32c);
125+
134126
}
135127

136128
TEST(ChecksumHelpersTest, UploadChecksumSettingsOnlyOldOptions) {

‎google/cloud/storage/internal/hash_function_impl_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ TEST(HashFunctionImplTest, CreateHashFunctionRead) {
383383
{"", "", ChecksumAlgorithm::kNone},
384384
{"", kQuickFoxMD5Hash, ChecksumAlgorithm::kMD5},
385385
{kQuickFoxCrc32cChecksum, "", ChecksumAlgorithm::kCrc32c},
386-
{kQuickFoxCrc32cChecksum, kQuickFoxMD5Hash, ChecksumAlgorithm::kCrc32cAndMD5},
386+
387387
};
388388

389389
for (auto const& test : cases) {

‎google/cloud/storage/internal/hash_validator_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ TEST(HashValidatorImplTest, CreateHashFunctionRead) {
205205
{"", "", ChecksumAlgorithm::kNone},
206206
{"", kQuickFoxMD5Hash, ChecksumAlgorithm::kMD5},
207207
{kQuickFoxCrc32cChecksum, "", ChecksumAlgorithm::kCrc32c},
208-
{kQuickFoxCrc32cChecksum, kQuickFoxMD5Hash, ChecksumAlgorithm::kCrc32cAndMD5},
208+
209209
};
210210

211211
for (auto const& test : cases) {

‎google/cloud/storage/options.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ struct CAPathOption {
9191
enum class ChecksumAlgorithm {
9292
kNone, ///< Disable checksum validation
9393
kCrc32c, ///< Use CRC32C for checksum validation
94-
kMD5, ///< Use MD5 for checksum validation
95-
kCrc32cAndMD5, ///< Use CRC32C and MD5 for checksum validation
94+
kMD5, ///< Use MD5 for checksum validation
9695
};
9796

9897
/**

‎google/cloud/storage/testing/upload_hash_cases.cc‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,7 @@ std::vector<UploadHashCase> UploadHashCases() {
5151
// DisableCrc32c == false, Crc32cChecksumValue == {} and change the MD5
5252
{kQuickFoxCrc32cChecksum, "", ChecksumAlgorithm::kCrc32c, Crc32cChecksumValue(), MD5HashValue()},
5353
{kQuickFoxCrc32cChecksum, kEmptyStringMD5Hash, ChecksumAlgorithm::kCrc32c, Crc32cChecksumValue(), MD5HashValue(kEmptyStringMD5Hash)},
54-
{kQuickFoxCrc32cChecksum, kQuickFoxMD5Hash, ChecksumAlgorithm::kCrc32cAndMD5, Crc32cChecksumValue(), MD5HashValue()},
55-
{kQuickFoxCrc32cChecksum, kEmptyStringMD5Hash, ChecksumAlgorithm::kCrc32cAndMD5, Crc32cChecksumValue(), MD5HashValue(kEmptyStringMD5Hash)},
5654

57-
// DisableCrc32c == false, Crc32cChecksumValue == kEmptyStringCrc32Checksum and change the MD5
58-
{kEmptyStringCrc32cChecksum, "", ChecksumAlgorithm::kCrc32c, Crc32cChecksumValue(kEmptyStringCrc32cChecksum), MD5HashValue()},
59-
{kEmptyStringCrc32cChecksum, kEmptyStringMD5Hash, ChecksumAlgorithm::kCrc32c, Crc32cChecksumValue(kEmptyStringCrc32cChecksum), MD5HashValue(kEmptyStringMD5Hash)},
60-
{kEmptyStringCrc32cChecksum, kQuickFoxMD5Hash, ChecksumAlgorithm::kCrc32cAndMD5, Crc32cChecksumValue(kEmptyStringCrc32cChecksum), MD5HashValue()},
61-
{kEmptyStringCrc32cChecksum, kEmptyStringMD5Hash, ChecksumAlgorithm::kCrc32cAndMD5, Crc32cChecksumValue(kEmptyStringCrc32cChecksum), MD5HashValue(kEmptyStringMD5Hash)},
6255
// clang-format on
6356
};
6457
}

‎google/cloud/storage/tests/object_checksum_integration_test.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ TEST_F(ObjectChecksumIntegrationTest, InsertObjectExplicitDisable) {
7979
}
8080
}
8181

82-
/// @test Verify that `Options{}.set<UploadChecksumValidationOption>(ChecksumAlgorithm::kCrc32cAndMD5)` works as expected.
82+
/// @test Verify that `Options{}.set<UploadChecksumValidationOption>(ChecksumAlgorithm::kCrc32c)` works as expected.
8383
TEST_F(ObjectChecksumIntegrationTest, InsertObjectExplicitEnable) {
8484
auto client = MakeIntegrationTestClient();
8585
auto object_name = MakeRandomObjectName();
@@ -179,7 +179,7 @@ TEST_F(ObjectChecksumIntegrationTest, WriteObjectExplicitEnable) {
179179
auto client = MakeIntegrationTestClient();
180180
auto object_name = MakeRandomObjectName();
181181
auto os = client.WriteObject(bucket_name_, object_name,
182-
Options{}.set<UploadChecksumValidationOption>(ChecksumAlgorithm::kCrc32cAndMD5), IfGenerationMatch(0));
182+
Options{}.set<UploadChecksumValidationOption>(ChecksumAlgorithm::kCrc32c), IfGenerationMatch(0));
183183
os << LoremIpsum();
184184
os.Close();
185185
auto meta = os.metadata();
@@ -282,7 +282,7 @@ TEST_F(ObjectChecksumIntegrationTest, WriteObjectWithFullChecksumValidation) {
282282
auto expected_crc32c = ComputeCrc32cChecksum(content);
283283

284284
auto os = client.WriteObject(bucket_name_, object_name,
285-
Options{}.set<UploadChecksumValidationOption>(ChecksumAlgorithm::kCrc32cAndMD5), IfGenerationMatch(0));
285+
Options{}.set<UploadChecksumValidationOption>(ChecksumAlgorithm::kCrc32c), IfGenerationMatch(0));
286286
os << content;
287287
os.Close();
288288
auto meta = os.metadata();

‎google/cloud/storage/tests/object_hash_integration_test.cc‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ TEST_F(ObjectHashIntegrationTest, InsertObjectExplicitDisable) {
7575
auto object_name = MakeRandomObjectName();
7676

7777
auto meta = client.InsertObject(
78-
bucket_name_, object_name, LoremIpsum(), Options{}.set<UploadChecksumValidationOption>(ChecksumAlgorithm::kCrc32cAndMD5), IfGenerationMatch(0));
78+
bucket_name_, object_name, LoremIpsum(), Options{}.set<UploadChecksumValidationOption>(ChecksumAlgorithm::kNone), IfGenerationMatch(0));
7979
ASSERT_STATUS_OK(meta);
8080
ScheduleForDelete(*meta);
8181

@@ -126,10 +126,9 @@ TEST_F(ObjectHashIntegrationTest, InsertObjectWithValueFailure) {
126126
auto client = MakeIntegrationTestClient();
127127
auto object_name = MakeRandomObjectName();
128128

129-
// This should fail because the MD5 hash value is incorrect.
130129
auto failure = client.InsertObject(
131130
bucket_name_, object_name, LoremIpsum(), MD5HashValue(ComputeMD5Hash("")),
132-
Options{}.set<UploadChecksumValidationOption>(ChecksumAlgorithm::kCrc32cAndMD5), IfGenerationMatch(0));
131+
Options{}.set<UploadChecksumValidationOption>(ChecksumAlgorithm::kMD5), IfGenerationMatch(0));
133132
EXPECT_THAT(failure, Not(IsOk()));
134133
}
135134

0 commit comments

Comments
 (0)