Refactor due to core updates: Replace and modify classes and methods. #974
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Replacements: org.opensearch.common.io.stream.StreamInput => org.opensearch.core.common.io.stream.StreamInput org.opensearch.common.io.stream.StreamOutput => org.opensearch.core.common.io.stream.StreamOutput org.opensearch.common.io.stream.NamedWriteableRegistry => org.opensearch.core.common.io.stream.NamedWriteableRegistry org.opensearch.common.xcontent.XContentParserUtils => org.opensearch.core.xcontent.XContentParserUtils org.opensearch.rest.RestStatus => org.opensearch.core.rest.RestStatus org.opensearch.common.bytes.BytesReference => org.opensearch.core.common.bytes.BytesReference org.opensearch.common.io.stream.InputStreamStreamInput => org.opensearch.core.common.io.stream.InputStreamStreamInput org.opensearch.common.io.stream.OutputStreamStreamOutput => org.opensearch.core.common.io.stream.OutputStreamStreamOutput org.opensearch.common.component.LifecycleListener => org.opensearch.common.lifecycle.LifecycleListener org.opensearch.common.io.stream.Writeable => org.opensearch.core.common.io.stream.Writeable org.opensearch.common.io.stream.NotSerializableExceptionWrapper => org.opensearch.core.common.io.stream.NotSerializableExceptionWrapper org.opensearch.common.bytes.BytesArray => org.opensearch.core.common.bytes.BytesArray XContentType => MediaType org.opensearch.common.ParsingException => org.opensearch.core.common.ParsingException org.opensearch.core.common.Strings.EMPTY_ARRAY=> org.opensearch.core.common.Strings.EMPTY_ARRAY org.opensearch.common.transport.TransportAddress => org.opensearch.core.common.transport.TransportAddress org.opensearch.common.io.stream.NamedWriteableAwareStreamInput => org.opensearch.core.common.io.stream.NamedWriteableAwareStreamInput org.opensearch.common.unit.ByteSizeValue => org.opensearch.core.common.unit.ByteSizeValue org.opensearch.index.Index => org.opensearch.core.index.Index org.opensearch.index.shard.ShardId => org.opensearch.core.index.shard.ShardId org.opensearch.core.index.IndexNotFoundException => org.opensearch.index.IndexNotFoundException org.opensearch.core.index.IndexingPressure => org.opensearch.index.IndexingPressure com.carrotsearch.hppc.BitMixer => org.opensearch.common.util.BitMixer Strings.toString(XContentBuilder) => XContentBuilder.toString org.apache.http.entity.ContentType.APPLICATION_JSON => org.apache.hc.core5.http.ContentType.APPLICATION_JSON org.opensearch.action.support.nodes.BaseNodeRequest => org.opensearch.transport.TransportRequest org.opensearch.transport.TransportResponse => org.opensearch.core.transport.TransportResponse org.opensearch.core.transport.TransportResponseHandler => org.opensearch.transport.TransportResponseHandler org.opensearch.indices.breaker.NoneCircuitBreakerService => org.opensearch.core.indices.breaker.NoneCircuitBreakerService MediaType.fromMediaType => XContentType.fromMediaType org.opensearch.common.transport.BoundTransportAddress => org.opensearch.core.common.transport.BoundTransportAddress Modifications: - Updated `StringTerms` constructor. Removed `requiredSize` and `minDocCount`, added `TermsAggregator.BucketCountThresholds`. See details [here](opensearch-project/OpenSearch@15b7de0). Tests: - Completed successful `gradle build`. Signed-off-by: Kaituo Li <[email protected]>
kaituo
requested review from
jackiehanyang,
joshpalis and
sudiptoguha
and removed request for
jackiehanyang
|
Local build passes. CI failed due to Can't get https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/2.10.0/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-job-scheduler-2.10.0.0.zip to /Users/runner/work/anomaly-detection/anomaly-detection/src/test/resources/job-scheduler/opensearch-job-scheduler-2.10.0.0.zip |
sudiptoguha
reviewed
Aug 11, 2023
| @@ -608,10 +608,10 @@ protected void validateCategoricalField(String detectorId, boolean indexingDryRu | |||
| ActionListener<GetFieldMappingsResponse> mappingsListener = ActionListener.wrap(getMappingsResponse -> { | |||
| // example getMappingsResponse: | |||
| // GetFieldMappingsResponse{mappings={server-metrics={_doc={service=FieldMappingMetadata{fullName='service', | |||
| // source=org.opensearch.common.bytes.BytesArray@7ba87dbd}}}}} | |||
| // source=org.opensearch.core.common.bytes.BytesArray@7ba87dbd}}}}} | |||
There was a problem hiding this comment.
This change is commented out. Is this for future use?
There was a problem hiding this comment.
It is a comment. The change is updating the comment.
sudiptoguha
reviewed
Aug 11, 2023
| Collections.emptyMap(), | ||
| DocValueFormat.RAW, | ||
| 1, | ||
| false, | ||
| 0, | ||
| stringBuckets, | ||
| 0 | ||
| 0, | ||
| new TermsAggregator.BucketCountThresholds(1, 0, 1, 0) |
There was a problem hiding this comment.
An extra field for extra tests? I see (1,0,0) being deleted -- and the addition is (1,0,1,0).
There was a problem hiding this comment.
This is due to changes in the core. Related wording in the PR description:
Updated StringTerms constructor. Removed requiredSize and minDocCount, added TermsAggregator.BucketCountThresholds. See details here
sudiptoguha
reviewed
Aug 11, 2023
| Collections.emptyMap(), | ||
| DocValueFormat.RAW, | ||
| 1, | ||
| false, | ||
| 0, | ||
| ImmutableList.of(), | ||
| 0 | ||
| 0, | ||
| new TermsAggregator.BucketCountThresholds(1, 0, 1, 0) |
There was a problem hiding this comment.
this is due to core changes. Please see my above reply.
sudiptoguha
approved these changes
Aug 11, 2023
joshpalis
approved these changes
Aug 11, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Replacements:
org.opensearch.common.io.stream.StreamInput→org.opensearch.core.common.io.stream.StreamInputorg.opensearch.common.io.stream.StreamOutput→org.opensearch.core.common.io.stream.StreamOutputorg.opensearch.common.io.stream.NamedWriteableRegistry→org.opensearch.core.common.io.stream.NamedWriteableRegistryorg.opensearch.common.xcontent.XContentParserUtils→org.opensearch.core.xcontent.XContentParserUtilsorg.opensearch.rest.RestStatus→org.opensearch.core.rest.RestStatusorg.opensearch.common.bytes.BytesReference→org.opensearch.core.common.bytes.BytesReferenceorg.opensearch.common.io.stream.InputStreamStreamInput→org.opensearch.core.common.io.stream.InputStreamStreamInputorg.opensearch.common.io.stream.OutputStreamStreamOutput→org.opensearch.core.common.io.stream.OutputStreamStreamOutputorg.opensearch.common.component.LifecycleListener→org.opensearch.common.lifecycle.LifecycleListenerorg.opensearch.common.io.stream.Writeable→org.opensearch.core.common.io.stream.Writeableorg.opensearch.common.io.stream.NotSerializableExceptionWrapper→org.opensearch.core.common.io.stream.NotSerializableExceptionWrapperorg.opensearch.common.bytes.BytesArray→org.opensearch.core.common.bytes.BytesArrayXContentType→MediaTypeorg.opensearch.common.ParsingException→org.opensearch.core.common.ParsingExceptionorg.opensearch.core.common.Strings.EMPTY_ARRAY→org.opensearch.core.common.Strings.EMPTY_ARRAYorg.opensearch.common.transport.TransportAddress→org.opensearch.core.common.transport.TransportAddressorg.opensearch.common.io.stream.NamedWriteableAwareStreamInput→org.opensearch.core.common.io.stream.NamedWriteableAwareStreamInputorg.opensearch.common.unit.ByteSizeValue→org.opensearch.core.common.unit.ByteSizeValueorg.opensearch.index.Index→org.opensearch.core.index.Indexorg.opensearch.index.shard.ShardId→org.opensearch.core.index.shard.ShardIdorg.opensearch.core.index.IndexNotFoundException→org.opensearch.index.IndexNotFoundExceptionorg.opensearch.core.index.IndexingPressure→org.opensearch.index.IndexingPressurecom.carrotsearch.hppc.BitMixer→org.opensearch.common.util.BitMixerStrings.toString(XContentBuilder)→XContentBuilder.toStringorg.apache.http.entity.ContentType.APPLICATION_JSON→org.apache.hc.core5.http.ContentType.APPLICATION_JSONorg.opensearch.action.support.nodes.BaseNodeRequest→org.opensearch.transport.TransportRequestorg.opensearch.transport.TransportResponse→org.opensearch.core.transport.TransportResponseorg.opensearch.core.transport.TransportResponseHandler→org.opensearch.transport.TransportResponseHandlerorg.opensearch.indices.breaker.NoneCircuitBreakerService→org.opensearch.core.indices.breaker.NoneCircuitBreakerServiceMediaType.fromMediaType→XContentType.fromMediaTypeorg.opensearch.common.transport.BoundTransportAddress→org.opensearch.core.common.transport.BoundTransportAddressModifications:
StringTermsconstructor. RemovedrequiredSizeandminDocCount, addedTermsAggregator.BucketCountThresholds. See details here.Tests:
gradle build.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.