Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: change int type to long #489

Merged
merged 4 commits into from
May 23, 2023
Merged

fix: change int type to long #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
849aebc
fix: change int type to long
szczepanczykd May 20, 2023
a3b7da5
update CHANGELOG.md
szczepanczykd May 20, 2023
47ee3b2
fix: change totalDataSetSizeInBytes to Long too
szczepanczykd May 20, 2023
290cd47
fix: skip removing opensearch-observability index in AfterTest cleanup
szczepanczykd May 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Fix AwsSdk2TransportOptions.responseCompression ([#322](https://github.com/opensearch-project/opensearch-java/pull/322))
- Fix missing Highlight and SourceConfig in the MultisearchBody ([#442](https://github.com/opensearch-project/opensearch-java/pull/442))
- Fix parsing /_alias error response for not existing alias ([#476](https://github.com/opensearch-project/opensearch-java/pull/476))

- Fix StoryStats numeric value out of range of int ([#489](https://github.com/opensearch-project/opensearch-java/pull/489))

### Security

Expand Down
30 changes: 15 additions & 15 deletions java-client/src/main/java/org/opensearch/client/opensearch/_types/StoreStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,18 @@ public class StoreStats implements JsonpSerializable {
@Nullable
private final String size;

private final int sizeInBytes;
private final long sizeInBytes;

@Nullable
private final String reserved;

private final int reservedInBytes;
private final long reservedInBytes;

@Nullable
private final String totalDataSetSize;

@Nullable
private final Integer totalDataSetSizeInBytes;
private final Long totalDataSetSizeInBytes;
Copy link
Collaborator Author

@szczepanczykd szczepanczykd May 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see this field in the response from API in version 2.7.0
image

Seems like it was never produced by the server, even from very first version:
https://github.com/opensearch-project/OpenSearch/blob/1.0/server/src/main/java/org/opensearch/index/store/StoreStats.java

Should I remove it or mark it as @deprecated?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mark it as deprecated, will remove in the next major version.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in: #497 :)


// ---------------------------------------------------------------------------------------------

Expand Down Expand Up @@ -98,7 +98,7 @@ public final String size() {
/**
* Required - API name: {@code size_in_bytes}
*/
public final int sizeInBytes() {
public final long sizeInBytes() {
return this.sizeInBytes;
}

Expand All @@ -113,7 +113,7 @@ public final String reserved() {
/**
* Required - API name: {@code reserved_in_bytes}
*/
public final int reservedInBytes() {
public final long reservedInBytes() {
return this.reservedInBytes;
}

Expand All @@ -129,7 +129,7 @@ public final String totalDataSetSize() {
* API name: {@code total_data_set_size_in_bytes}
*/
@Nullable
public final Integer totalDataSetSizeInBytes() {
public final Long totalDataSetSizeInBytes() {
return this.totalDataSetSizeInBytes;
}

Expand Down Expand Up @@ -183,18 +183,18 @@ public static class Builder extends ObjectBuilderBase implements ObjectBuilder<S
@Nullable
private String size;

private Integer sizeInBytes;
private Long sizeInBytes;

@Nullable
private String reserved;

private Integer reservedInBytes;
private Long reservedInBytes;

@Nullable
private String totalDataSetSize;

@Nullable
private Integer totalDataSetSizeInBytes;
private Long totalDataSetSizeInBytes;

/**
* API name: {@code size}
Expand All @@ -207,7 +207,7 @@ public final Builder size(@Nullable String value) {
/**
* Required - API name: {@code size_in_bytes}
*/
public final Builder sizeInBytes(int value) {
public final Builder sizeInBytes(long value) {
this.sizeInBytes = value;
return this;
}
Expand All @@ -223,7 +223,7 @@ public final Builder reserved(@Nullable String value) {
/**
* Required - API name: {@code reserved_in_bytes}
*/
public final Builder reservedInBytes(int value) {
public final Builder reservedInBytes(long value) {
this.reservedInBytes = value;
return this;
}
Expand All @@ -239,7 +239,7 @@ public final Builder totalDataSetSize(@Nullable String value) {
/**
* API name: {@code total_data_set_size_in_bytes}
*/
public final Builder totalDataSetSizeInBytes(@Nullable Integer value) {
public final Builder totalDataSetSizeInBytes(@Nullable Long value) {
this.totalDataSetSizeInBytes = value;
return this;
}
Expand Down Expand Up @@ -268,11 +268,11 @@ public StoreStats build() {
protected static void setupStoreStatsDeserializer(ObjectDeserializer<StoreStats.Builder> op) {

op.add(Builder::size, JsonpDeserializer.stringDeserializer(), "size");
op.add(Builder::sizeInBytes, JsonpDeserializer.integerDeserializer(), "size_in_bytes");
op.add(Builder::sizeInBytes, JsonpDeserializer.longDeserializer(), "size_in_bytes");
op.add(Builder::reserved, JsonpDeserializer.stringDeserializer(), "reserved");
op.add(Builder::reservedInBytes, JsonpDeserializer.integerDeserializer(), "reserved_in_bytes");
op.add(Builder::reservedInBytes, JsonpDeserializer.longDeserializer(), "reserved_in_bytes");
op.add(Builder::totalDataSetSize, JsonpDeserializer.stringDeserializer(), "total_data_set_size");
op.add(Builder::totalDataSetSizeInBytes, JsonpDeserializer.integerDeserializer(),
op.add(Builder::totalDataSetSizeInBytes, JsonpDeserializer.longDeserializer(),
"total_data_set_size_in_bytes");

}
Expand Down
3 changes: 2 additions & 1 deletion ...rc/test/java/org/opensearch/client/opensearch/integTest/OpenSearchJavaClientTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import javax.net.ssl.SSLEngine;

public abstract class OpenSearchJavaClientTestCase extends OpenSearchRestTestCase implements OpenSearchTransportSupport {
private static final List<String> systemIndices = List.of(".opensearch-observability", ".opendistro_security");
private static OpenSearchClient javaClient;
private static OpenSearchClient adminJavaClient;

Expand Down Expand Up @@ -161,7 +162,7 @@ protected void wipeAllOSIndices() throws IOException {
.indices(r -> r.headers("index,creation.date").expandWildcards(ExpandWildcard.All));

for (IndicesRecord index : response.valueBody()) {
if (index.index() != null && !".opendistro_security".equals(index.index())) {
if (index.index() != null && !systemIndices.contains(index.index())) {
adminJavaClient().indices().delete(new DeleteIndexRequest.Builder().index(index.index()).build());
}
}
Expand Down