Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-10278: moved everything to common package

This commit is contained in:
Noble Paul 2017-04-18 18:43:00 +09:30
parent bb48de8b00
commit c5a9012d0c
15 changed files with 37 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
View File

@ -76,7 +76,7 @@ import org.apache.solr.handler.component.ShardHandler;
import org.apache.solr.handler.component.ShardHandlerFactory;
import org.apache.solr.handler.component.ShardRequest;
import org.apache.solr.handler.component.ShardResponse;
import org.apache.solr.recipe.PolicyHelper;
import org.apache.solr.autoscaling.PolicyHelper;
import org.apache.solr.util.DefaultSolrThreadFactory;
import org.apache.solr.util.RTimer;
import org.apache.solr.util.TimeOut;

2
solr/core/src/test/org/apache/solr/cloud/policy/TestPolicyCloud.java → solr/core/src/test/org/apache/solr/cloud/autoscaling/TestPolicyCloud.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.solr.cloud.policy;
package org.apache.solr.cloud.autoscaling;
import java.io.IOException;
import java.lang.invoke.MethodHandles;

4
solr/solrj/src/java/org/apache/solr/client/solrj/impl/ClientDataProvider.java
View File

@ -45,8 +45,8 @@ import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.common.util.Utils;
import org.apache.solr.recipe.ClusterDataProvider;
import org.apache.solr.recipe.Policy.ReplicaInfo;
import org.apache.solr.autoscaling.ClusterDataProvider;
import org.apache.solr.autoscaling.Policy.ReplicaInfo;
import org.apache.zookeeper.data.Stat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
solr/solrj/src/java/org/apache/solr/recipe/AddReplicaSuggester.java → solr/solrj/src/java/org/apache/solr/cloud/autoscaling/AddReplicaSuggester.java
View File

@ -15,12 +15,12 @@
* limitations under the License.
*/
package org.apache.solr.recipe;
package org.apache.solr.cloud.autoscaling;
import java.util.Map;
import org.apache.solr.common.util.Utils;
import org.apache.solr.recipe.Policy.Suggester;
import org.apache.solr.cloud.autoscaling.Policy.Suggester;
import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP;
import static org.apache.solr.common.cloud.ZkStateReader.SHARD_ID_PROP;

2
solr/solrj/src/java/org/apache/solr/recipe/Cell.java → solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Cell.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.recipe;
package org.apache.solr.cloud.autoscaling;
import java.io.IOException;

26
solr/solrj/src/java/org/apache/solr/recipe/Clause.java → solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Clause.java
View File

@ -15,11 +15,10 @@
* limitations under the License.
*/
package org.apache.solr.recipe;
package org.apache.solr.cloud.autoscaling;
import java.io.IOException;
import java.util.Arrays;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@ -27,25 +26,24 @@ import java.util.Objects;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import com.sun.istack.internal.NotNull;
import org.apache.solr.common.MapWriter;
import org.apache.solr.common.util.Utils;
import org.apache.solr.recipe.Policy.ReplicaInfo;
import org.apache.solr.cloud.autoscaling.Policy.ReplicaInfo;
import static java.util.Collections.singletonMap;
import static org.apache.solr.common.params.CoreAdminParams.COLLECTION;
import static org.apache.solr.common.params.CoreAdminParams.REPLICA;
import static org.apache.solr.common.params.CoreAdminParams.SHARD;
import static org.apache.solr.recipe.Clause.TestStatus.FAIL;
import static org.apache.solr.recipe.Clause.TestStatus.NOT_APPLICABLE;
import static org.apache.solr.recipe.Clause.TestStatus.PASS;
import static org.apache.solr.recipe.Operand.EQUAL;
import static org.apache.solr.recipe.Operand.GREATER_THAN;
import static org.apache.solr.recipe.Operand.LESS_THAN;
import static org.apache.solr.recipe.Operand.NOT_EQUAL;
import static org.apache.solr.recipe.Operand.WILDCARD;
import static org.apache.solr.recipe.Policy.ANY;
import static org.apache.solr.recipe.Policy.EACH;
import static org.apache.solr.autoscaling.Clause.TestStatus.FAIL;
import static org.apache.solr.autoscaling.Clause.TestStatus.NOT_APPLICABLE;
import static org.apache.solr.autoscaling.Clause.TestStatus.PASS;
import static org.apache.solr.cloud.autoscaling.Operand.EQUAL;
import static org.apache.solr.cloud.autoscaling.Operand.GREATER_THAN;
import static org.apache.solr.cloud.autoscaling.Operand.LESS_THAN;
import static org.apache.solr.cloud.autoscaling.Operand.NOT_EQUAL;
import static org.apache.solr.cloud.autoscaling.Operand.WILDCARD;
import static org.apache.solr.cloud.autoscaling.Policy.ANY;
import static org.apache.solr.cloud.autoscaling.Policy.EACH;
// a set of conditions in a policy
public class Clause implements MapWriter, Comparable<Clause> {

2
solr/solrj/src/java/org/apache/solr/recipe/ClusterDataProvider.java → solr/solrj/src/java/org/apache/solr/cloud/autoscaling/ClusterDataProvider.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.recipe;
package org.apache.solr.cloud.autoscaling;
import java.io.Closeable;
import java.io.IOException;

4
solr/solrj/src/java/org/apache/solr/recipe/MoveReplicaSuggester.java → solr/solrj/src/java/org/apache/solr/cloud/autoscaling/MoveReplicaSuggester.java
View File

@ -15,13 +15,13 @@
* limitations under the License.
*/
package org.apache.solr.recipe;
package org.apache.solr.cloud.autoscaling;
import java.util.Map;
import org.apache.solr.common.util.Pair;
import org.apache.solr.common.util.Utils;
import org.apache.solr.recipe.Policy.Suggester;
import org.apache.solr.cloud.autoscaling.Policy.Suggester;
import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP;
import static org.apache.solr.common.cloud.ZkStateReader.SHARD_ID_PROP;

8
solr/solrj/src/java/org/apache/solr/recipe/Operand.java → solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Operand.java
View File

@ -15,14 +15,14 @@
* limitations under the License.
*/
package org.apache.solr.recipe;
package org.apache.solr.cloud.autoscaling;
import java.util.Objects;
import org.apache.solr.recipe.Clause.TestStatus;
import org.apache.solr.autoscaling.Clause.TestStatus;
import static org.apache.solr.recipe.Clause.TestStatus.*;
import static org.apache.solr.recipe.Policy.ANY;
import static org.apache.solr.autoscaling.Clause.TestStatus.*;
import static org.apache.solr.cloud.autoscaling.Policy.ANY;
public enum Operand {

8
solr/solrj/src/java/org/apache/solr/recipe/Policy.java → solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Policy.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.recipe;
package org.apache.solr.cloud.autoscaling;
import java.io.IOException;
import java.util.ArrayList;
@ -34,18 +34,12 @@ import java.util.stream.Collectors;
import org.apache.solr.common.IteratorWriter;
import org.apache.solr.common.MapWriter;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CollectionParams.CollectionAction;
import org.apache.solr.common.params.CoreAdminParams;
import org.apache.solr.common.util.Utils;
import static java.util.Arrays.asList;
import static java.util.Collections.singletonList;
import static java.util.stream.Collectors.toList;
import static org.apache.solr.common.params.CollectionParams.CollectionAction.ADDREPLICA;
import static org.apache.solr.common.util.Utils.getDeepCopy;
import static org.apache.solr.recipe.Policy.Suggester.Hint.COLL;
import static org.apache.solr.recipe.Policy.Suggester.Hint.SHARD;
public class Policy implements MapWriter {
public static final String EACH = "#EACH";

6
solr/solrj/src/java/org/apache/solr/recipe/PolicyHelper.java → solr/solrj/src/java/org/apache/solr/cloud/autoscaling/PolicyHelper.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.recipe;
package org.apache.solr.cloud.autoscaling;
import java.util.ArrayList;
@ -29,8 +29,8 @@ import org.apache.solr.common.util.Utils;
import static java.util.Arrays.asList;
import static org.apache.solr.common.params.CollectionParams.CollectionAction.ADDREPLICA;
import static org.apache.solr.recipe.Policy.Suggester.Hint.COLL;
import static org.apache.solr.recipe.Policy.Suggester.Hint.SHARD;
import static org.apache.solr.autoscaling.Policy.Suggester.Hint.COLL;
import static org.apache.solr.autoscaling.Policy.Suggester.Hint.SHARD;
public class PolicyHelper {
public static Map<String, List<String>> getReplicaLocations(String collName, Map<String, Object> autoScalingJson,

3
solr/solrj/src/java/org/apache/solr/recipe/Preference.java → solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Preference.java
View File

@ -15,12 +15,11 @@
* limitations under the License.
*/
package org.apache.solr.recipe;
package org.apache.solr.cloud.autoscaling;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.function.BiConsumer;
import org.apache.solr.common.MapWriter;
import org.apache.solr.common.util.Utils;

4
solr/solrj/src/java/org/apache/solr/recipe/Row.java → solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Row.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.recipe;
package org.apache.solr.cloud.autoscaling;
import java.io.IOException;
import java.util.ArrayList;
@ -29,7 +29,7 @@ import org.apache.solr.common.IteratorWriter;
import org.apache.solr.common.MapWriter;
import org.apache.solr.common.util.Pair;
import org.apache.solr.common.util.Utils;
import org.apache.solr.recipe.Policy.ReplicaInfo;
import org.apache.solr.autoscaling.Policy.ReplicaInfo;
import static org.apache.solr.common.params.CoreAdminParams.NODE;

4
solr/solrj/src/java/org/apache/solr/recipe/package-info.java → solr/solrj/src/java/org/apache/solr/cloud/autoscaling/package-info.java
View File

@ -16,7 +16,7 @@
*/
/**
* Common classes for recipe parsing filtering nodes and sorting
* Common classes for autoscaling parsing filtering nodes and sorting
*/
package org.apache.solr.recipe;
package org.apache.solr.cloud.autoscaling;

4
solr/solrj/src/test/org/apache/solr/recipe/TestPolicy.java → solr/solrj/src/test/org/apache/solr/autoscaling/TestPolicy.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.solr.recipe;
package org.apache.solr.autoscaling;
import java.io.IOException;
@ -29,7 +29,7 @@ import java.util.Map;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.util.Utils;
import org.apache.solr.common.util.ValidatingJsonMap;
import org.apache.solr.recipe.Policy.Suggester.Hint;
import org.apache.solr.autoscaling.Policy.Suggester.Hint;
import static org.apache.solr.common.params.CollectionParams.CollectionAction.ADDREPLICA;
import static org.apache.solr.common.util.Utils.getObjectByPath;