fixing copy constructor error and adding test for it

sfc-gh-jslocum · sfc-gh-jslocum · commit 98f2fd3cb98c · 2023-03-15T16:39:07.000-05:00
diff --git a/fdbclient/include/fdbclient/BlobMetadataUtils.h b/fdbclient/include/fdbclient/BlobMetadataUtils.h
@@ -56,13 +56,13 @@ struct BlobMetadataDetailsRef {
 
 	explicit BlobMetadataDetailsRef(Arena& ar,
 	                                BlobMetadataDomainId domainId,
-	                                Optional<StringRef> base,
+	                                Optional<StringRef> baseLocation,
 	                                VectorRef<StringRef> partitions,
 	                                double refreshAt,
 	                                double expireAt)
 	  : domainId(domainId), partitions(ar, partitions), refreshAt(refreshAt), expireAt(expireAt) {
-		if (base.present()) {
-			base = StringRef(ar, base.get());
+		if (baseLocation.present()) {
+			base = StringRef(ar, baseLocation.get());
 		}
 	}
 
diff --git a/fdbserver/RESTKmsConnector.actor.cpp b/fdbserver/RESTKmsConnector.actor.cpp
@@ -1539,6 +1539,7 @@ void testGetBlobMetadataRequestBody(Reference<RESTKmsConnectorCtx> ctx) {
 	for (const auto& detail : details) {
 		auto it = domainIds.find(detail.domainId);
 		ASSERT(it != domainIds.end());
+		ASSERT(detail.base.present() || !detail.partitions.empty());
 	}
 	if (refreshKmsUrls) {
 		validateKmsUrls(ctx);

Original file line number	Diff line number	Diff line change
`@@ -1539,6 +1539,7 @@ void testGetBlobMetadataRequestBody(Reference<RESTKmsConnectorCtx> ctx) {`
`1539`	`1539`	`for (const auto& detail : details) {`
`1540`	`1540`	`auto it = domainIds.find(detail.domainId);`
`1541`	`1541`	`ASSERT(it != domainIds.end());`
	`1542`	`+ ASSERT(detail.base.present() \|\| !detail.partitions.empty());`
`1542`	`1543`	`}`
`1543`	`1544`	`if (refreshKmsUrls) {`
`1544`	`1545`	`validateKmsUrls(ctx);`