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

Move Configuration from common.cost to common #1135

Merged
merged 1 commit into from
Nov 18, 2022
Merged

Move Configuration from common.cost to common #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 app/src/main/java/org/astraea/app/scenario/ScenarioMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import com.beust.jcommander.Parameter;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.astraea.common.Configuration;
import org.astraea.common.Utils;
import org.astraea.common.admin.Admin;
import org.astraea.common.argument.Argument;
import org.astraea.common.cost.Configuration;
import org.astraea.common.scenario.Scenario;

public class ScenarioMain extends Argument {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/astraea/app/web/BalancerHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.astraea.common.Configuration;
import org.astraea.common.DataSize;
import org.astraea.common.FutureUtils;
import org.astraea.common.Utils;
Expand All @@ -51,7 +52,6 @@
import org.astraea.common.balancer.algorithms.GreedyBalancer;
import org.astraea.common.balancer.executor.RebalancePlanExecutor;
import org.astraea.common.balancer.executor.StraightPlanExecutor;
import org.astraea.common.cost.Configuration;
import org.astraea.common.cost.HasClusterCost;
import org.astraea.common.cost.HasMoveCost;
import org.astraea.common.cost.MoveCost;
Expand Down
2 changes: 1 addition & 1 deletion app/src/test/java/org/astraea/app/web/BalancerHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.astraea.common.Configuration;
import org.astraea.common.DataSize;
import org.astraea.common.Utils;
import org.astraea.common.admin.Admin;
Expand All @@ -53,7 +54,6 @@
import org.astraea.common.balancer.executor.StraightPlanExecutor;
import org.astraea.common.balancer.log.ClusterLogAllocation;
import org.astraea.common.cost.ClusterCost;
import org.astraea.common.cost.Configuration;
import org.astraea.common.cost.HasClusterCost;
import org.astraea.common.cost.HasMoveCost;
import org.astraea.common.cost.MoveCost;
Expand Down
2 changes: 1 addition & 1 deletion ...rg/astraea/common/cost/Configuration.java → ...ava/org/astraea/common/Configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.astraea.common.cost;
package org.astraea.common;

import java.util.Arrays;
import java.util.Collections;
Expand Down
1 change: 0 additions & 1 deletion common/src/main/java/org/astraea/common/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import java.util.function.Supplier;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import org.astraea.common.cost.Configuration;

public final class Utils {

Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/org/astraea/common/balancer/algorithms/AlgorithmConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
import java.util.function.BiPredicate;
import java.util.function.Predicate;
import java.util.function.Supplier;
import org.astraea.common.Configuration;
import org.astraea.common.admin.ClusterBean;
import org.astraea.common.balancer.Balancer;
import org.astraea.common.cost.ClusterCost;
import org.astraea.common.cost.Configuration;
import org.astraea.common.cost.HasClusterCost;
import org.astraea.common.cost.HasMoveCost;
import org.astraea.common.cost.MoveCost;
Expand Down
1 change: 1 addition & 0 deletions common/src/main/java/org/astraea/common/cost/CostFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.astraea.common.cost;

import java.util.Optional;
import org.astraea.common.Configuration;
import org.astraea.common.metrics.collector.Fetcher;

/**
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/org/astraea/common/partitioner/Dispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
import org.apache.kafka.clients.producer.Partitioner;
import org.apache.kafka.clients.producer.Producer;
import org.apache.kafka.common.Cluster;
import org.astraea.common.Configuration;
import org.astraea.common.Utils;
import org.astraea.common.admin.ClusterInfo;
import org.astraea.common.admin.ReplicaInfo;
import org.astraea.common.cost.Configuration;

public interface Dispatcher extends Partitioner {
/**
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/org/astraea/common/partitioner/PartitionerUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.Map;
import java.util.Properties;
import java.util.stream.Collectors;
import org.astraea.common.cost.Configuration;
import org.astraea.common.Configuration;

/** do poisson for node's load situation */
public class PartitionerUtils {
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/org/astraea/common/partitioner/StrictCostDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.astraea.common.Configuration;
import org.astraea.common.Utils;
import org.astraea.common.admin.ClusterInfo;
import org.astraea.common.admin.NodeInfo;
import org.astraea.common.admin.ReplicaInfo;
import org.astraea.common.argument.DurationField;
import org.astraea.common.cost.BrokerCost;
import org.astraea.common.cost.Configuration;
import org.astraea.common.cost.HasBrokerCost;
import org.astraea.common.cost.NodeLatencyCost;
import org.astraea.common.metrics.collector.MetricCollector;
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/astraea/common/partitioner/smooth/SmoothWeightRoundRobinDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
import java.util.function.Supplier;
import java.util.stream.Collectors;
import org.apache.kafka.common.Cluster;
import org.astraea.common.Configuration;
import org.astraea.common.Lazy;
import org.astraea.common.Utils;
import org.astraea.common.admin.ClusterBean;
import org.astraea.common.admin.ClusterInfo;
import org.astraea.common.admin.NodeInfo;
import org.astraea.common.admin.ReplicaInfo;
import org.astraea.common.cost.Configuration;
import org.astraea.common.cost.NeutralIntegratedCost;
import org.astraea.common.metrics.collector.MetricCollector;
import org.astraea.common.partitioner.Dispatcher;
Expand Down
1 change: 0 additions & 1 deletion common/src/test/java/org/astraea/common/UtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import java.util.concurrent.ExecutionException;
import java.util.stream.IntStream;
import java.util.stream.Stream;
import org.astraea.common.cost.Configuration;
import org.astraea.common.cost.CostFunction;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
Expand Down
2 changes: 1 addition & 1 deletion common/src/test/java/org/astraea/common/balancer/algorithms/GreedyBalancerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
import java.util.Map;
import java.util.UUID;
import java.util.stream.IntStream;
import org.astraea.common.Configuration;
import org.astraea.common.Utils;
import org.astraea.common.balancer.Balancer;
import org.astraea.common.balancer.FakeClusterInfo;
import org.astraea.common.cost.Configuration;
import org.astraea.common.cost.DecreasingCost;
import org.astraea.common.metrics.BeanQuery;
import org.astraea.common.metrics.MBeanClient;
Expand Down
1 change: 1 addition & 0 deletions common/src/test/java/org/astraea/common/cost/DecreasingCost.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.astraea.common.cost;

import org.astraea.common.Configuration;
import org.astraea.common.admin.ClusterBean;
import org.astraea.common.admin.ClusterInfo;
import org.astraea.common.admin.Replica;
Expand Down
2 changes: 1 addition & 1 deletion common/src/test/java/org/astraea/common/partitioner/ConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;
import org.astraea.common.cost.Configuration;
import org.astraea.common.Configuration;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

Expand Down
2 changes: 1 addition & 1 deletion common/src/test/java/org/astraea/common/partitioner/DispatcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
import org.apache.kafka.common.Cluster;
import org.apache.kafka.common.metrics.stats.Value;
import org.apache.kafka.common.serialization.ByteArraySerializer;
import org.astraea.common.Configuration;
import org.astraea.common.Header;
import org.astraea.common.Utils;
import org.astraea.common.admin.Admin;
import org.astraea.common.admin.ClusterInfo;
import org.astraea.common.admin.ReplicaInfo;
import org.astraea.common.cost.Configuration;
import org.astraea.common.producer.Metadata;
import org.astraea.common.producer.Producer;
import org.astraea.common.producer.Record;
Expand Down
2 changes: 1 addition & 1 deletion common/src/test/java/org/astraea/common/partitioner/PartitionerUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import java.util.HashMap;
import java.util.Map;
import org.astraea.common.cost.Configuration;
import org.astraea.common.Configuration;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

Expand Down
2 changes: 1 addition & 1 deletion common/src/test/java/org/astraea/common/partitioner/StrictCostDispatcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.astraea.common.Configuration;
import org.astraea.common.Utils;
import org.astraea.common.admin.ClusterBean;
import org.astraea.common.admin.ClusterInfo;
import org.astraea.common.admin.NodeInfo;
import org.astraea.common.admin.ReplicaInfo;
import org.astraea.common.cost.BrokerCost;
import org.astraea.common.cost.BrokerInputCost;
import org.astraea.common.cost.Configuration;
import org.astraea.common.cost.HasBrokerCost;
import org.astraea.common.cost.NodeThroughputCost;
import org.astraea.common.cost.ReplicaLeaderCost;
Expand Down
2 changes: 1 addition & 1 deletion connector/src/main/java/org/astraea/connector/SourceConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import java.util.Map;
import java.util.stream.Collectors;
import org.apache.kafka.common.config.ConfigDef;
import org.astraea.common.Configuration;
import org.astraea.common.VersionUtils;
import org.astraea.common.cost.Configuration;

public abstract class SourceConnector extends org.apache.kafka.connect.source.SourceConnector {

Expand Down
2 changes: 1 addition & 1 deletion connector/src/main/java/org/astraea/connector/SourceTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import java.util.stream.Collectors;
import org.apache.kafka.connect.data.Schema;
import org.apache.kafka.connect.source.SourceRecord;
import org.astraea.common.Configuration;
import org.astraea.common.VersionUtils;
import org.astraea.common.cost.Configuration;
import org.astraea.common.producer.Metadata;
import org.astraea.common.producer.Record;

Expand Down
2 changes: 1 addition & 1 deletion connector/src/test/java/org/astraea/connector/SourceConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Map;
import org.astraea.common.cost.Configuration;
import org.astraea.common.Configuration;
import org.astraea.common.http.HttpExecutor;
import org.astraea.common.json.TypeRef;
import org.astraea.common.producer.Record;
Expand Down