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

SOLR-7280: precommit errors

This commit is contained in:
Noble Paul 2016-07-16 19:54:43 +05:30
parent 6c1b75b06b
commit 74633594d8
3 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
solr/core/src/java/org/apache/solr/core/CoreContainer.java
View File

@ -36,7 +36,6 @@ import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;

33
solr/core/src/java/org/apache/solr/core/CoreSorter.java
View File

@ -1,20 +1,3 @@
package org.apache.solr.core;
import java.util.Collection;
import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import org.apache.solr.cloud.CloudDescriptor;
import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.DocCollection;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice;
import static java.util.Collections.emptyList;
import static java.util.stream.Collectors.toList;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with * contributor license agreements. See the NOTICE file distributed with
@ -38,6 +21,22 @@ import static java.util.stream.Collectors.toList;
* happening in other nodes of the cluster * happening in other nodes of the cluster
* *
*/ */
package org.apache.solr.core;
import java.util.Collection;
import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import org.apache.solr.cloud.CloudDescriptor;
import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.DocCollection;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice;
import static java.util.Collections.emptyList;
import static java.util.stream.Collectors.toList;
public class CoreSorter { public class CoreSorter {
Map<String, CountsForEachShard> shardsVsReplicaCounts = new LinkedHashMap<>(); Map<String, CountsForEachShard> shardsVsReplicaCounts = new LinkedHashMap<>();
CoreContainer cc; CoreContainer cc;

36
solr/core/src/test/org/apache/solr/core/CoreSorterTest.java
View File

@ -1,3 +1,19 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.solr.core; package org.apache.solr.core;
import java.util.ArrayList; import java.util.ArrayList;
@ -27,24 +43,6 @@ import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.reset; import static org.easymock.EasyMock.reset;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
public class CoreSorterTest extends SolrTestCaseJ4 { public class CoreSorterTest extends SolrTestCaseJ4 {
Map<String, Boolean> nodes = new LinkedHashMap<>(); Map<String, Boolean> nodes = new LinkedHashMap<>();
Set<String> liveNodes = new HashSet<>(); Set<String> liveNodes = new HashSet<>();
@ -77,7 +75,7 @@ public class CoreSorterTest extends SolrTestCaseJ4 {
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
List<CountsForEachShard> copy = new ArrayList<>(l); List<CountsForEachShard> copy = new ArrayList<>(l);
Collections.shuffle(copy); Collections.shuffle(copy, random());
Collections.sort(copy, CoreSorter.countsComparator); Collections.sort(copy, CoreSorter.countsComparator);
for (int j = 0; j < copy.size(); j++) { for (int j = 0; j < copy.size(); j++) {
assertEquals(expected.get(j), copy.get(j)); assertEquals(expected.get(j), copy.get(j));