Skip to content

Commit a2aafaa

Browse files
committed
removing unused members
Signed-off-by: Sooraj Sinha <[email protected]>
1 parent acacbea commit a2aafaa

File tree

5 files changed

+14
-8
lines changed

5 files changed

+14
-8
lines changed

server/src/main/java/org/opensearch/common/remote/RemoteWritableEntityStore.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
package org.opensearch.common.remote;
1010

11+
import org.opensearch.common.annotation.ExperimentalApi;
1112
import org.opensearch.core.action.ActionListener;
1213

1314
import java.io.IOException;
@@ -18,6 +19,7 @@
1819
* @param <T> The object type which can be uploaded to or downloaded from remote storage.
1920
* @param <U> The wrapper entity which provides methods for serializing/deserializing entity T.
2021
*/
22+
@ExperimentalApi
2123
public interface RemoteWritableEntityStore<T, U extends RemoteWriteableEntity<T>> {
2224

2325
public void writeAsync(U entity, ActionListener<Void> listener);

server/src/main/java/org/opensearch/common/remote/RemoteWriteableEntity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
package org.opensearch.common.remote;
1010

11+
import org.opensearch.common.annotation.ExperimentalApi;
12+
1113
import java.io.IOException;
1214
import java.io.InputStream;
1315

@@ -17,6 +19,7 @@
1719
*
1820
* @param <T> The object type which can be uploaded to or downloaded from remote storage.
1921
*/
22+
@ExperimentalApi
2023
public interface RemoteWriteableEntity<T> {
2124
/**
2225
* @return An InputStream created by serializing the entity T

server/src/main/java/org/opensearch/gateway/remote/model/RemoteClusterMetadataManifest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ public class RemoteClusterMetadataManifest extends AbstractRemoteWritableBlobEnt
3636

3737
public static final String METADATA_MANIFEST_NAME_FORMAT = "%s";
3838
public static final int MANIFEST_CURRENT_CODEC_VERSION = ClusterMetadataManifest.CODEC_V3;
39+
public static final String COMMITTED = "C";
40+
public static final String PUBLISHED = "P";
3941

4042
/**
4143
* Manifest format compatible with older codec v0, where codec version was missing.
@@ -93,11 +95,10 @@ public String generateBlobFileName() {
9395
MANIFEST,
9496
RemoteStoreUtils.invertLong(clusterMetadataManifest.getClusterTerm()),
9597
RemoteStoreUtils.invertLong(clusterMetadataManifest.getStateVersion()),
96-
(clusterMetadataManifest.isCommitted() ? "C" : "P"), // C for committed and P for published
98+
(clusterMetadataManifest.isCommitted() ? COMMITTED : PUBLISHED),
9799
RemoteStoreUtils.invertLong(System.currentTimeMillis()),
98-
String.valueOf(clusterMetadataManifest.getCodecVersion()) // Keep the codec version at last place only, during read we reads
99-
// last place to
100-
// determine codec version.
100+
String.valueOf(clusterMetadataManifest.getCodecVersion())
101+
// Keep the codec version at last place only, during we read last place to determine codec version.
101102
);
102103
this.blobFileName = blobFileName;
103104
return blobFileName;

server/src/main/java/org/opensearch/gateway/remote/model/RemoteGlobalMetadata.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222

2323
import static org.opensearch.gateway.remote.RemoteClusterStateUtils.METADATA_NAME_FORMAT;
2424

25+
/**
26+
* Wrapper class for uploading/downloading global metadata ({@link Metadata}) to/from remote blob store
27+
*/
2528
public class RemoteGlobalMetadata extends AbstractRemoteWritableBlobEntity<Metadata> {
2629

2730
public static final ChecksumBlobStoreFormat<Metadata> GLOBAL_METADATA_FORMAT = new ChecksumBlobStoreFormat<>(
@@ -30,9 +33,6 @@ public class RemoteGlobalMetadata extends AbstractRemoteWritableBlobEntity<Metad
3033
Metadata::fromXContent
3134
);
3235

33-
private Metadata metadata;
34-
private final String blobName;
35-
3636
public RemoteGlobalMetadata(
3737
final String blobName,
3838
final String clusterUUID,

server/src/test/java/org/opensearch/gateway/remote/model/RemoteIndexMetadataTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public void testGetUploadedMetadata() throws IOException {
160160
try (InputStream inputStream = remoteObjectForUpload.serialize()) {
161161
remoteObjectForUpload.setFullBlobName(new BlobPath().add(TEST_BLOB_PATH));
162162
UploadedMetadata uploadedMetadata = remoteObjectForUpload.getUploadedMetadata();
163-
assertThat(uploadedMetadata.getUploadedFilename(), is(remoteObjectForUpload.getFullBlobName()));
163+
assertThat(uploadedMetadata.getUploadedFilename(), is(remoteObjectForUpload.getBlobFileName()));
164164
}
165165
}
166166

0 commit comments

Comments
 (0)