Skip to content

Commit 1ed094a

Browse files
committed
[Refactor] CircuitBreaker foundation classes to core library (#9006)
This commit refactors the following CircuitBreaker foundation classes from the server module to the core library: * o.o.common.breaker.CircuitBreaker * o.o.common.breaker.CircuitBreakingException * o.o.common.breaker.NoopCircuitBreaker * o.o.indices.breaker.AllCircuitBreakerStats * o.o.indices.breaker.CircuitBreakerService * o.o.indices.breaker.CircuitBreakerStats * o.o.indices.breaker.NoneCircuitBreakerService The following base support classes are also refactored from the server to appropriate common or core libraries as a side effect: * o.o.common.component.AbstractLifecycleComponent * o.o.common.component.Lifecycle * o.o.common.component.LifecycleComponent * o.o.common.component.LifecycleListener * o.o.common.unit.ByteSizeUnit * o.o.common.unit.ByteSizeValue Tests and documentation are updated. Signed-off-by: Nicholas Walter Knize <nknize@apache.org> (cherry picked from commit 639d28a)
1 parent e660d56 commit 1ed094a

File tree

434 files changed

+759
-687
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

434 files changed

+759
-687
lines changed

benchmarks/src/main/java/org/opensearch/benchmark/search/aggregations/TermsReduceBenchmark.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@
4040
import org.opensearch.action.search.SearchPhaseController;
4141
import org.opensearch.action.search.SearchProgressListener;
4242
import org.opensearch.action.search.SearchRequest;
43-
import org.opensearch.common.breaker.CircuitBreaker;
44-
import org.opensearch.common.breaker.NoopCircuitBreaker;
43+
import org.opensearch.core.common.breaker.CircuitBreaker;
44+
import org.opensearch.core.common.breaker.NoopCircuitBreaker;
4545
import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
4646
import org.opensearch.common.lucene.search.TopDocsAndMaxScore;
4747
import org.opensearch.common.settings.Settings;
4848
import org.opensearch.core.index.Index;
4949
import org.opensearch.core.index.shard.ShardId;
50-
import org.opensearch.indices.breaker.NoneCircuitBreakerService;
50+
import org.opensearch.core.indices.breaker.NoneCircuitBreakerService;
5151
import org.opensearch.search.DocValueFormat;
5252
import org.opensearch.search.SearchModule;
5353
import org.opensearch.search.SearchShardTarget;

benchmarks/src/main/java/org/opensearch/benchmark/store/remote/filecache/FileCacheBenchmark.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import org.openjdk.jmh.annotations.Threads;
2828
import org.openjdk.jmh.annotations.Warmup;
2929
import org.openjdk.jmh.infra.Blackhole;
30-
import org.opensearch.common.breaker.CircuitBreaker;
31-
import org.opensearch.common.breaker.NoopCircuitBreaker;
30+
import org.opensearch.core.common.breaker.CircuitBreaker;
31+
import org.opensearch.core.common.breaker.NoopCircuitBreaker;
3232
import org.opensearch.index.store.remote.filecache.CachedIndexInput;
3333
import org.opensearch.index.store.remote.filecache.FileCache;
3434
import org.opensearch.index.store.remote.filecache.FileCacheFactory;

client/rest-high-level/src/main/java/org/opensearch/client/indices/DataStreamsStatsResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
import org.opensearch.client.core.BroadcastResponse;
3636
import org.opensearch.core.ParseField;
37-
import org.opensearch.common.unit.ByteSizeValue;
37+
import org.opensearch.core.common.unit.ByteSizeValue;
3838
import org.opensearch.core.xcontent.ConstructingObjectParser;
3939
import org.opensearch.core.xcontent.ObjectParser;
4040
import org.opensearch.core.xcontent.XContentParser;

client/rest-high-level/src/main/java/org/opensearch/client/indices/ResizeRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.opensearch.common.settings.Settings;
4040
import org.opensearch.core.xcontent.ToXContentObject;
4141
import org.opensearch.core.xcontent.XContentBuilder;
42-
import org.opensearch.common.unit.ByteSizeValue;
42+
import org.opensearch.core.common.unit.ByteSizeValue;
4343

4444
import java.io.IOException;
4545
import java.util.Collections;

client/rest-high-level/src/main/java/org/opensearch/client/indices/rollover/RolloverRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.opensearch.action.admin.indices.rollover.MaxSizeCondition;
3838
import org.opensearch.client.TimedRequest;
3939
import org.opensearch.client.indices.CreateIndexRequest;
40-
import org.opensearch.common.unit.ByteSizeValue;
40+
import org.opensearch.core.common.unit.ByteSizeValue;
4141
import org.opensearch.common.unit.TimeValue;
4242
import org.opensearch.core.xcontent.ToXContentObject;
4343
import org.opensearch.core.xcontent.XContentBuilder;

client/rest-high-level/src/test/java/org/opensearch/client/BulkProcessorIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
import org.opensearch.action.search.SearchRequest;
4545
import org.opensearch.common.Strings;
4646
import org.opensearch.core.common.bytes.BytesArray;
47-
import org.opensearch.common.unit.ByteSizeUnit;
48-
import org.opensearch.common.unit.ByteSizeValue;
47+
import org.opensearch.core.common.unit.ByteSizeUnit;
48+
import org.opensearch.core.common.unit.ByteSizeValue;
4949
import org.opensearch.common.unit.TimeValue;
5050
import org.opensearch.core.xcontent.XContentBuilder;
5151
import org.opensearch.common.xcontent.XContentType;

client/rest-high-level/src/test/java/org/opensearch/client/ClusterClientIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
import org.opensearch.cluster.routing.allocation.decider.EnableAllocationDecider;
6161
import org.opensearch.common.compress.CompressedXContent;
6262
import org.opensearch.common.settings.Settings;
63-
import org.opensearch.common.unit.ByteSizeUnit;
63+
import org.opensearch.core.common.unit.ByteSizeUnit;
6464
import org.opensearch.common.unit.TimeValue;
6565
import org.opensearch.common.xcontent.XContentType;
6666
import org.opensearch.common.xcontent.support.XContentMapValues;

client/rest-high-level/src/test/java/org/opensearch/client/CrudIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
import org.opensearch.client.indices.GetIndexRequest;
6161
import org.opensearch.core.common.bytes.BytesReference;
6262
import org.opensearch.common.settings.Settings;
63-
import org.opensearch.common.unit.ByteSizeUnit;
64-
import org.opensearch.common.unit.ByteSizeValue;
63+
import org.opensearch.core.common.unit.ByteSizeUnit;
64+
import org.opensearch.core.common.unit.ByteSizeValue;
6565
import org.opensearch.core.common.Strings;
6666
import org.opensearch.core.xcontent.XContentBuilder;
6767
import org.opensearch.common.xcontent.XContentFactory;

client/rest-high-level/src/test/java/org/opensearch/client/IndicesClientIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@
112112
import org.opensearch.common.compress.CompressedXContent;
113113
import org.opensearch.common.settings.Setting;
114114
import org.opensearch.common.settings.Settings;
115-
import org.opensearch.common.unit.ByteSizeUnit;
116-
import org.opensearch.common.unit.ByteSizeValue;
115+
import org.opensearch.core.common.unit.ByteSizeUnit;
116+
import org.opensearch.core.common.unit.ByteSizeValue;
117117
import org.opensearch.common.unit.TimeValue;
118118
import org.opensearch.core.common.Strings;
119119
import org.opensearch.core.xcontent.XContentBuilder;

client/rest-high-level/src/test/java/org/opensearch/client/IndicesRequestConvertersTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
import org.opensearch.core.common.Strings;
8080
import org.opensearch.test.OpenSearchTestCase;
8181
import org.junit.Assert;
82-
import org.opensearch.common.unit.ByteSizeValue;
82+
import org.opensearch.core.common.unit.ByteSizeValue;
8383

8484
import java.io.IOException;
8585
import java.util.Arrays;

0 commit comments

Comments
 (0)