honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove Redundant GetAllSnapshots Method from RepositoryData (#44259) (#44271) 

* With the removal of the incompatible snapshots list in RepositoryData
the get snapshots and get all snapshots methods are equivalent so I
removed one of them
This commit is contained in:
Armin Braun 2019-07-12 15:03:09 +02:00 committed by GitHub
parent 068286ca4b
commit 9b4f50b40a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java
View File

@ -94,7 +94,7 @@ public class TransportGetSnapshotsAction extends TransportMasterNodeAction<GetSn
final RepositoryData repositoryData; final RepositoryData repositoryData;
if (isCurrentSnapshotsOnly(request.snapshots()) == false) { if (isCurrentSnapshotsOnly(request.snapshots()) == false) {
repositoryData = snapshotsService.getRepositoryData(repository); repositoryData = snapshotsService.getRepositoryData(repository);
for (SnapshotId snapshotId : repositoryData.getAllSnapshotIds()) { for (SnapshotId snapshotId : repositoryData.getSnapshotIds()) {
allSnapshotIds.put(snapshotId.getName(), snapshotId); allSnapshotIds.put(snapshotId.getName(), snapshotId);
} }
} else { } else {

2
server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java
View File

@ -194,7 +194,7 @@ public class TransportSnapshotsStatusAction extends TransportMasterNodeAction<Sn
if (Strings.hasText(repositoryName) && request.snapshots() != null && request.snapshots().length > 0) { if (Strings.hasText(repositoryName) && request.snapshots() != null && request.snapshots().length > 0) {
final Set<String> requestedSnapshotNames = Sets.newHashSet(request.snapshots()); final Set<String> requestedSnapshotNames = Sets.newHashSet(request.snapshots());
final RepositoryData repositoryData = snapshotsService.getRepositoryData(repositoryName); final RepositoryData repositoryData = snapshotsService.getRepositoryData(repositoryName);
final Map<String, SnapshotId> matchedSnapshotIds = repositoryData.getAllSnapshotIds().stream() final Map<String, SnapshotId> matchedSnapshotIds = repositoryData.getSnapshotIds().stream()
.filter(s -> requestedSnapshotNames.contains(s.getName())) .filter(s -> requestedSnapshotNames.contains(s.getName()))
.collect(Collectors.toMap(SnapshotId::getName, Function.identity())); .collect(Collectors.toMap(SnapshotId::getName, Function.identity()));
for (final String snapshotName : request.snapshots()) { for (final String snapshotName : request.snapshots()) {

7
server/src/main/java/org/elasticsearch/repositories/RepositoryData.java
View File

@ -107,13 +107,6 @@ public final class RepositoryData {
return Collections.unmodifiableCollection(snapshotIds.values()); return Collections.unmodifiableCollection(snapshotIds.values());
} }
/**
* Returns an immutable collection of all the snapshot ids in the repository.
*/
public Collection<SnapshotId> getAllSnapshotIds() {
return new ArrayList<>(snapshotIds.values());
}
/** /**
* Returns the {@link SnapshotState} for the given snapshot. Returns {@code null} if * Returns the {@link SnapshotState} for the given snapshot. Returns {@code null} if
* there is no state for the snapshot. * there is no state for the snapshot.

4
server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
View File

@ -388,7 +388,7 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent imp
final String snapshotName = snapshotId.getName(); final String snapshotName = snapshotId.getName();
// check if the snapshot name already exists in the repository // check if the snapshot name already exists in the repository
final RepositoryData repositoryData = getRepositoryData(); final RepositoryData repositoryData = getRepositoryData();
if (repositoryData.getAllSnapshotIds().stream().anyMatch(s -> s.getName().equals(snapshotName))) { if (repositoryData.getSnapshotIds().stream().anyMatch(s -> s.getName().equals(snapshotName))) {
throw new InvalidSnapshotNameException(metadata.name(), snapshotId.getName(), "snapshot with the same name already exists"); throw new InvalidSnapshotNameException(metadata.name(), snapshotId.getName(), "snapshot with the same name already exists");
} }
@ -460,7 +460,7 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent imp
private void cleanupStaleRootFiles(Set<String> rootBlobNames, RepositoryData repositoryData) { private void cleanupStaleRootFiles(Set<String> rootBlobNames, RepositoryData repositoryData) {
final Set<String> allSnapshotIds = final Set<String> allSnapshotIds =
repositoryData.getAllSnapshotIds().stream().map(SnapshotId::getUUID).collect(Collectors.toSet()); repositoryData.getSnapshotIds().stream().map(SnapshotId::getUUID).collect(Collectors.toSet());
final List<String> blobsToDelete = rootBlobNames.stream().filter( final List<String> blobsToDelete = rootBlobNames.stream().filter(
blob -> { blob -> {
if (FsBlobContainer.isTempBlobName(blob)) { if (FsBlobContainer.isTempBlobName(blob)) {