You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/07/04 18:04:15 UTC
[1/5] lucene-solr:jira/solr-10879: SOLR-10957: Changed
SolrCoreParser.init to use the resource loader from getSchema() instead of
the resource loader from getCore().
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-10879 c80c8cc59 -> 2b729a09c
SOLR-10957: Changed SolrCoreParser.init to use the resource loader from getSchema() instead of the resource loader from getCore().
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/db71c561
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/db71c561
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/db71c561
Branch: refs/heads/jira/solr-10879
Commit: db71c5615ac2f150e6e0b9f8e4126a0d46a29ef6
Parents: d3c67cf
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Jul 4 12:02:40 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue Jul 4 14:13:00 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
solr/core/src/java/org/apache/solr/search/SolrCoreParser.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/db71c561/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8c5f2c1..1517163 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -74,6 +74,9 @@ Other Changes
* SOLR-10827: Factor out abstract FilteringSolrMetricReporter class. (Christine Poerschke)
+* SOLR-10957: Changed SolrCoreParser.init to use the resource loader from getSchema()
+ instead of the resource loader from getCore(). (Christine Poerschke)
+
================== 7.0.0 ==================
Versions of Major Components
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/db71c561/solr/core/src/java/org/apache/solr/search/SolrCoreParser.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/SolrCoreParser.java b/solr/core/src/java/org/apache/solr/search/SolrCoreParser.java
index 0a2cf58..a5c2b03 100755
--- a/solr/core/src/java/org/apache/solr/search/SolrCoreParser.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrCoreParser.java
@@ -57,7 +57,7 @@ public class SolrCoreParser extends CoreParser implements NamedListInitializedPl
if (req == null) {
loader = new SolrResourceLoader();
} else {
- loader = req.getCore().getResourceLoader();
+ loader = req.getSchema().getResourceLoader();
}
final Iterable<Map.Entry<String,Object>> args = initArgs;
[2/5] lucene-solr:jira/solr-10879: SOLR-10827: Factor out abstract
FilteringSolrMetricReporter class.
Posted by ab...@apache.org.
SOLR-10827: Factor out abstract FilteringSolrMetricReporter class.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d3c67cf5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d3c67cf5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d3c67cf5
Branch: refs/heads/jira/solr-10879
Commit: d3c67cf5e4c4f1809e7c7ff921c55562fa6cb13f
Parents: bc37e8b
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Jul 4 11:18:48 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Tue Jul 4 14:13:00 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 2 +-
.../metrics/FilteringSolrMetricReporter.java | 59 ++++++++++++++++++++
.../metrics/reporters/SolrGangliaReporter.java | 34 ++---------
.../metrics/reporters/SolrGraphiteReporter.java | 34 ++---------
.../solr/metrics/reporters/SolrJmxReporter.java | 51 +++++++----------
.../metrics/reporters/SolrSlf4jReporter.java | 34 ++---------
.../reporters/solr/SolrShardReporter.java | 26 ++++-----
7 files changed, 101 insertions(+), 139 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d3c67cf5/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 403b6cd..8c5f2c1 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -72,7 +72,7 @@ Optimizations
Other Changes
----------------------
-(No Changes)
+* SOLR-10827: Factor out abstract FilteringSolrMetricReporter class. (Christine Poerschke)
================== 7.0.0 ==================
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d3c67cf5/solr/core/src/java/org/apache/solr/metrics/FilteringSolrMetricReporter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/metrics/FilteringSolrMetricReporter.java b/solr/core/src/java/org/apache/solr/metrics/FilteringSolrMetricReporter.java
new file mode 100644
index 0000000..5f29f8e
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/metrics/FilteringSolrMetricReporter.java
@@ -0,0 +1,59 @@
+/*
+ * 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.metrics;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.codahale.metrics.MetricFilter;
+
+public abstract class FilteringSolrMetricReporter extends SolrMetricReporter {
+
+ protected List<String> filters = new ArrayList<>();
+
+ public FilteringSolrMetricReporter(SolrMetricManager metricManager, String registryName) {
+ super(metricManager, registryName);
+ }
+
+ public void setFilter(List<String> filters) {
+ if (filters == null || filters.isEmpty()) {
+ return;
+ }
+ this.filters.addAll(filters);
+ }
+
+ public void setFilter(String filter) {
+ if (filter != null && !filter.isEmpty()) {
+ this.filters.add(filter);
+ }
+ }
+
+ /**
+ * Report only metrics with names matching any of the prefix filters.
+ * If the filters list is empty then all names will match.
+ */
+ protected MetricFilter newMetricFilter() {
+ final MetricFilter filter;
+ if (!filters.isEmpty()) {
+ filter = new SolrMetricManager.PrefixFilter(filters);
+ } else {
+ filter = MetricFilter.ALL;
+ }
+ return filter;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d3c67cf5/solr/core/src/java/org/apache/solr/metrics/reporters/SolrGangliaReporter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/metrics/reporters/SolrGangliaReporter.java b/solr/core/src/java/org/apache/solr/metrics/reporters/SolrGangliaReporter.java
index bf95ef4..8d77a02 100644
--- a/solr/core/src/java/org/apache/solr/metrics/reporters/SolrGangliaReporter.java
+++ b/solr/core/src/java/org/apache/solr/metrics/reporters/SolrGangliaReporter.java
@@ -17,26 +17,24 @@
package org.apache.solr.metrics.reporters;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
import java.util.concurrent.TimeUnit;
import com.codahale.metrics.MetricFilter;
import com.codahale.metrics.ganglia.GangliaReporter;
import info.ganglia.gmetric4j.gmetric.GMetric;
+
+import org.apache.solr.metrics.FilteringSolrMetricReporter;
import org.apache.solr.metrics.SolrMetricManager;
-import org.apache.solr.metrics.SolrMetricReporter;
/**
*
*/
-public class SolrGangliaReporter extends SolrMetricReporter {
+public class SolrGangliaReporter extends FilteringSolrMetricReporter {
private String host = null;
private int port = -1;
private boolean multicast;
private String instancePrefix = null;
- private List<String> filters = new ArrayList<>();
private boolean testing;
private GangliaReporter reporter;
@@ -68,25 +66,6 @@ public class SolrGangliaReporter extends SolrMetricReporter {
this.instancePrefix = prefix;
}
- /**
- * Report only metrics with names matching any of the prefix filters.
- * @param filters list of 0 or more prefixes. If the list is empty then
- * all names will match.
- */
- public void setFilter(List<String> filters) {
- if (filters == null || filters.isEmpty()) {
- return;
- }
- this.filters.addAll(filters);
- }
-
- // due to vagaries of SolrPluginUtils.invokeSetters we need this too
- public void setFilter(String filter) {
- if (filter != null && !filter.isEmpty()) {
- this.filters.add(filter);
- }
- }
-
public void setMulticast(boolean multicast) {
this.multicast = multicast;
}
@@ -141,12 +120,7 @@ public class SolrGangliaReporter extends SolrMetricReporter {
.convertRatesTo(TimeUnit.SECONDS)
.convertDurationsTo(TimeUnit.MILLISECONDS)
.prefixedWith(instancePrefix);
- MetricFilter filter;
- if (!filters.isEmpty()) {
- filter = new SolrMetricManager.PrefixFilter(filters);
- } else {
- filter = MetricFilter.ALL;
- }
+ final MetricFilter filter = newMetricFilter();
builder = builder.filter(filter);
reporter = builder.build(ganglia);
reporter.start(period, TimeUnit.SECONDS);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d3c67cf5/solr/core/src/java/org/apache/solr/metrics/reporters/SolrGraphiteReporter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/metrics/reporters/SolrGraphiteReporter.java b/solr/core/src/java/org/apache/solr/metrics/reporters/SolrGraphiteReporter.java
index c097718..68111d5 100644
--- a/solr/core/src/java/org/apache/solr/metrics/reporters/SolrGraphiteReporter.java
+++ b/solr/core/src/java/org/apache/solr/metrics/reporters/SolrGraphiteReporter.java
@@ -17,8 +17,6 @@
package org.apache.solr.metrics.reporters;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
import java.util.concurrent.TimeUnit;
import com.codahale.metrics.MetricFilter;
@@ -26,19 +24,19 @@ import com.codahale.metrics.graphite.Graphite;
import com.codahale.metrics.graphite.GraphiteReporter;
import com.codahale.metrics.graphite.GraphiteSender;
import com.codahale.metrics.graphite.PickledGraphite;
+
+import org.apache.solr.metrics.FilteringSolrMetricReporter;
import org.apache.solr.metrics.SolrMetricManager;
-import org.apache.solr.metrics.SolrMetricReporter;
/**
* Metrics reporter that wraps {@link com.codahale.metrics.graphite.GraphiteReporter}.
*/
-public class SolrGraphiteReporter extends SolrMetricReporter {
+public class SolrGraphiteReporter extends FilteringSolrMetricReporter {
private String host = null;
private int port = -1;
private boolean pickled = false;
private String instancePrefix = null;
- private List<String> filters = new ArrayList<>();
private GraphiteReporter reporter = null;
private static final ReporterClientCache<GraphiteSender> serviceRegistry = new ReporterClientCache<>();
@@ -66,25 +64,6 @@ public class SolrGraphiteReporter extends SolrMetricReporter {
this.instancePrefix = prefix;
}
- /**
- * Report only metrics with names matching any of the prefix filters.
- * @param filters list of 0 or more prefixes. If the list is empty then
- * all names will match.
- */
- public void setFilter(List<String> filters) {
- if (filters == null || filters.isEmpty()) {
- return;
- }
- this.filters.addAll(filters);
- }
-
- public void setFilter(String filter) {
- if (filter != null && !filter.isEmpty()) {
- this.filters.add(filter);
- }
- }
-
-
public void setPickled(boolean pickled) {
this.pickled = pickled;
}
@@ -113,12 +92,7 @@ public class SolrGraphiteReporter extends SolrMetricReporter {
.prefixedWith(instancePrefix)
.convertRatesTo(TimeUnit.SECONDS)
.convertDurationsTo(TimeUnit.MILLISECONDS);
- MetricFilter filter;
- if (!filters.isEmpty()) {
- filter = new SolrMetricManager.PrefixFilter(filters);
- } else {
- filter = MetricFilter.ALL;
- }
+ final MetricFilter filter = newMetricFilter();
builder = builder.filter(filter);
reporter = builder.build(graphite);
reporter.start(period, TimeUnit.SECONDS);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d3c67cf5/solr/core/src/java/org/apache/solr/metrics/reporters/SolrJmxReporter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/metrics/reporters/SolrJmxReporter.java b/solr/core/src/java/org/apache/solr/metrics/reporters/SolrJmxReporter.java
index 170dd33..b7504b8 100644
--- a/solr/core/src/java/org/apache/solr/metrics/reporters/SolrJmxReporter.java
+++ b/solr/core/src/java/org/apache/solr/metrics/reporters/SolrJmxReporter.java
@@ -22,9 +22,7 @@ import javax.management.ObjectInstance;
import javax.management.ObjectName;
import java.lang.invoke.MethodHandles;
-import java.util.ArrayList;
import java.util.HashSet;
-import java.util.List;
import java.util.Locale;
import java.util.Set;
@@ -33,6 +31,8 @@ import com.codahale.metrics.JmxReporter;
import com.codahale.metrics.MetricFilter;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.MetricRegistryListener;
+
+import org.apache.solr.metrics.FilteringSolrMetricReporter;
import org.apache.solr.metrics.MetricsMap;
import org.apache.solr.metrics.SolrMetricManager;
import org.apache.solr.metrics.SolrMetricReporter;
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
* <p>NOTE: {@link JmxReporter} that this class uses exports only newly added metrics (it doesn't
* process already existing metrics in a registry)</p>
*/
-public class SolrJmxReporter extends SolrMetricReporter {
+public class SolrJmxReporter extends FilteringSolrMetricReporter {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -56,7 +56,6 @@ public class SolrJmxReporter extends SolrMetricReporter {
private String agentId;
private String serviceUrl;
private String rootName;
- private List<String> filters = new ArrayList<>();
private JmxReporter reporter;
private MetricRegistry registry;
@@ -103,16 +102,7 @@ public class SolrJmxReporter extends SolrMetricReporter {
}
JmxObjectNameFactory jmxObjectNameFactory = new JmxObjectNameFactory(pluginInfo.name, fullDomain);
registry = metricManager.registry(registryName);
- // filter out MetricsMap gauges - we have a better way of handling them
- MetricFilter mmFilter = (name, metric) -> !(metric instanceof MetricsMap);
- MetricFilter filter;
- if (filters.isEmpty()) {
- filter = mmFilter;
- } else {
- // apply also prefix filters
- SolrMetricManager.PrefixFilter prefixFilter = new SolrMetricManager.PrefixFilter(filters);
- filter = new SolrMetricManager.AndFilter(prefixFilter, mmFilter);
- }
+ final MetricFilter filter = newMetricFilter();
reporter = JmxReporter.forRegistry(registry)
.registerWith(mBeanServer)
@@ -128,6 +118,21 @@ public class SolrJmxReporter extends SolrMetricReporter {
log.info("JMX monitoring for '" + fullDomain + "' (registry '" + registryName + "') enabled at server: " + mBeanServer);
}
+ @Override
+ protected MetricFilter newMetricFilter() {
+ // filter out MetricsMap gauges - we have a better way of handling them
+ final MetricFilter mmFilter = (name, metric) -> !(metric instanceof MetricsMap);
+ final MetricFilter filter;
+ if (filters.isEmpty()) {
+ filter = mmFilter;
+ } else {
+ // apply also prefix filters
+ SolrMetricManager.PrefixFilter prefixFilter = new SolrMetricManager.PrefixFilter(filters);
+ filter = new SolrMetricManager.AndFilter(prefixFilter, mmFilter);
+ }
+ return filter;
+ }
+
/**
* Stops the reporter from publishing metrics.
*/
@@ -223,24 +228,6 @@ public class SolrJmxReporter extends SolrMetricReporter {
}
/**
- * Report only metrics with names matching any of the prefix filters.
- * @param filters list of 0 or more prefixes. If the list is empty then
- * all names will match.
- */
- public void setFilter(List<String> filters) {
- if (filters == null || filters.isEmpty()) {
- return;
- }
- this.filters.addAll(filters);
- }
-
- public void setFilter(String filter) {
- if (filter != null && !filter.isEmpty()) {
- this.filters.add(filter);
- }
- }
-
- /**
* Return the reporter's MBeanServer.
*
* @return the reporter's MBeanServer
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d3c67cf5/solr/core/src/java/org/apache/solr/metrics/reporters/SolrSlf4jReporter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/metrics/reporters/SolrSlf4jReporter.java b/solr/core/src/java/org/apache/solr/metrics/reporters/SolrSlf4jReporter.java
index e2c6015..930bd31 100644
--- a/solr/core/src/java/org/apache/solr/metrics/reporters/SolrSlf4jReporter.java
+++ b/solr/core/src/java/org/apache/solr/metrics/reporters/SolrSlf4jReporter.java
@@ -18,14 +18,13 @@ package org.apache.solr.metrics.reporters;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
-import java.util.ArrayList;
-import java.util.List;
import java.util.concurrent.TimeUnit;
import com.codahale.metrics.MetricFilter;
import com.codahale.metrics.Slf4jReporter;
+
+import org.apache.solr.metrics.FilteringSolrMetricReporter;
import org.apache.solr.metrics.SolrMetricManager;
-import org.apache.solr.metrics.SolrMetricReporter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,14 +41,13 @@ import org.slf4j.LoggerFactory;
* metrics group, eg. <code>solr.jvm</code></li>
* </ul>
*/
-public class SolrSlf4jReporter extends SolrMetricReporter {
+public class SolrSlf4jReporter extends FilteringSolrMetricReporter {
@SuppressWarnings("unused") // we need this to pass validate-source-patterns
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String instancePrefix = null;
private String logger = null;
- private List<String> filters = new ArrayList<>();
private Slf4jReporter reporter;
/**
@@ -67,25 +65,6 @@ public class SolrSlf4jReporter extends SolrMetricReporter {
this.instancePrefix = prefix;
}
- /**
- * Report only metrics with names matching any of the prefix filters.
- * @param filters list of 0 or more prefixes. If the list is empty then
- * all names will match.
- */
- public void setFilter(List<String> filters) {
- if (filters == null || filters.isEmpty()) {
- return;
- }
- this.filters.addAll(filters);
- }
-
- public void setFilter(String filter) {
- if (filter != null && !filter.isEmpty()) {
- this.filters.add(filter);
- }
- }
-
-
public void setLogger(String logger) {
this.logger = logger;
}
@@ -102,12 +81,7 @@ public class SolrSlf4jReporter extends SolrMetricReporter {
.convertRatesTo(TimeUnit.SECONDS)
.convertDurationsTo(TimeUnit.MILLISECONDS);
- MetricFilter filter;
- if (!filters.isEmpty()) {
- filter = new SolrMetricManager.PrefixFilter(filters);
- } else {
- filter = MetricFilter.ALL;
- }
+ final MetricFilter filter = newMetricFilter();
builder = builder.filter(filter);
if (logger == null || logger.isEmpty()) {
// construct logger name from Group
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d3c67cf5/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrShardReporter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrShardReporter.java b/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrShardReporter.java
index e9710b8..086c812 100644
--- a/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrShardReporter.java
+++ b/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrShardReporter.java
@@ -30,11 +30,13 @@ import org.apache.solr.common.cloud.DocCollection;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.admin.MetricsCollectorHandler;
+import org.apache.solr.metrics.FilteringSolrMetricReporter;
import org.apache.solr.metrics.SolrMetricManager;
-import org.apache.solr.metrics.SolrMetricReporter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.codahale.metrics.MetricFilter;
+
/**
* This class reports selected metrics from replicas to shard leader.
* <p>The following configuration properties are supported:</p>
@@ -56,7 +58,7 @@ import org.slf4j.LoggerFactory;
* </reporter>
* </pre>
*/
-public class SolrShardReporter extends SolrMetricReporter {
+public class SolrShardReporter extends FilteringSolrMetricReporter {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final List<String> DEFAULT_FILTERS = new ArrayList(){{
@@ -70,7 +72,6 @@ public class SolrShardReporter extends SolrMetricReporter {
}};
private String handler = MetricsCollectorHandler.HANDLER_PATH;
- private List<String> filters = new ArrayList<>();
private SolrReporter reporter;
@@ -89,19 +90,6 @@ public class SolrShardReporter extends SolrMetricReporter {
this.handler = handler;
}
- public void setFilter(List<String> filterConfig) {
- if (filterConfig == null || filterConfig.isEmpty()) {
- return;
- }
- filters.addAll(filterConfig);
- }
-
- public void setFilter(String filter) {
- if (filter != null && !filter.isEmpty()) {
- this.filters.add(filter);
- }
- }
-
@Override
protected void doInit() {
if (filters.isEmpty()) {
@@ -111,6 +99,12 @@ public class SolrShardReporter extends SolrMetricReporter {
}
@Override
+ protected MetricFilter newMetricFilter() {
+ // unsupported here since setCore(SolrCore) directly uses the this.filters
+ throw new UnsupportedOperationException(getClass().getCanonicalName()+".newMetricFilter() is not supported");
+ }
+
+ @Override
protected void validate() throws IllegalStateException {
// (period < 1) means "don't start reporter" and so no (period > 0) validation needed
}
[5/5] lucene-solr:jira/solr-10879: Merge branch 'master' into
jira/solr-10879
Posted by ab...@apache.org.
Merge branch 'master' into jira/solr-10879
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2b729a09
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2b729a09
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2b729a09
Branch: refs/heads/jira/solr-10879
Commit: 2b729a09c38accf5b957951a037294131bbe7a74
Parents: c80c8cc ddfa074
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue Jul 4 20:04:03 2017 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue Jul 4 20:04:03 2017 +0200
----------------------------------------------------------------------
lucene/CHANGES.txt | 4 ++
.../lucene/document/NumericDocValuesField.java | 6 +-
.../document/SortedNumericDocValuesField.java | 6 +-
.../lucene/search/TestDocValuesQueries.java | 24 ++++----
.../search/TestIndexOrDocValuesQuery.java | 4 +-
.../lucene/document/LatLonDocValuesField.java | 4 +-
.../search/TestLatLonDocValuesQueries.java | 4 +-
solr/CHANGES.txt | 5 +-
.../org/apache/solr/cloud/MoveReplicaCmd.java | 1 -
.../metrics/FilteringSolrMetricReporter.java | 59 ++++++++++++++++++++
.../metrics/reporters/SolrGangliaReporter.java | 34 ++---------
.../metrics/reporters/SolrGraphiteReporter.java | 34 ++---------
.../solr/metrics/reporters/SolrJmxReporter.java | 51 +++++++----------
.../metrics/reporters/SolrSlf4jReporter.java | 34 ++---------
.../reporters/solr/SolrShardReporter.java | 26 ++++-----
.../java/org/apache/solr/schema/EnumField.java | 2 +-
.../solr/schema/LatLonPointSpatialField.java | 6 +-
.../apache/solr/schema/NumericFieldType.java | 4 +-
.../org/apache/solr/search/SolrCoreParser.java | 2 +-
.../apache/solr/cloud/MoveReplicaHDFSTest.java | 16 ++++++
.../org/apache/solr/cloud/MoveReplicaTest.java | 1 -
21 files changed, 155 insertions(+), 172 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2b729a09/solr/CHANGES.txt
----------------------------------------------------------------------
[3/5] lucene-solr:jira/solr-10879: LUCENE-7892: Add "slow" to factory
methods of doc-values queries.
Posted by ab...@apache.org.
LUCENE-7892: Add "slow" to factory methods of doc-values queries.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1e6e4022
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1e6e4022
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1e6e4022
Branch: refs/heads/jira/solr-10879
Commit: 1e6e4022cf6b8f927ec6a10f4d4c4b866fce8f0f
Parents: db71c56
Author: Adrien Grand <jp...@gmail.com>
Authored: Tue Jul 4 16:44:13 2017 +0200
Committer: Adrien Grand <jp...@gmail.com>
Committed: Tue Jul 4 16:44:13 2017 +0200
----------------------------------------------------------------------
lucene/CHANGES.txt | 4 ++++
.../lucene/document/NumericDocValuesField.java | 6 ++---
.../document/SortedNumericDocValuesField.java | 6 ++---
.../lucene/search/TestDocValuesQueries.java | 24 ++++++++++----------
.../search/TestIndexOrDocValuesQuery.java | 4 ++--
.../lucene/document/LatLonDocValuesField.java | 4 ++--
.../search/TestLatLonDocValuesQueries.java | 4 ++--
.../java/org/apache/solr/schema/EnumField.java | 2 +-
.../solr/schema/LatLonPointSpatialField.java | 6 ++---
.../apache/solr/schema/NumericFieldType.java | 4 ++--
10 files changed, 34 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1e6e4022/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 9226eb3..475a361 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -100,6 +100,10 @@ API Changes
DoubleValuesSource extensions, or with the new ShapeValuesSource and
ShapeValuesPredicate classes (Alan Woodward, David Smiley)
+* LUCENE-7892: Doc-values query factory methods have been renamed so that their
+ name contains "slow" in order to cleary indicate that they would usually be a
+ bad choice. (Adrien Grand)
+
Bug Fixes
* LUCENE-7626: IndexWriter will no longer accept broken token offsets
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1e6e4022/lucene/core/src/java/org/apache/lucene/document/NumericDocValuesField.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/document/NumericDocValuesField.java b/lucene/core/src/java/org/apache/lucene/document/NumericDocValuesField.java
index 6d84492..89210db 100644
--- a/lucene/core/src/java/org/apache/lucene/document/NumericDocValuesField.java
+++ b/lucene/core/src/java/org/apache/lucene/document/NumericDocValuesField.java
@@ -78,7 +78,7 @@ public class NumericDocValuesField extends Field {
* alongside a range query that executes on points, such as
* {@link LongPoint#newRangeQuery}.
*/
- public static Query newRangeQuery(String field, long lowerValue, long upperValue) {
+ public static Query newSlowRangeQuery(String field, long lowerValue, long upperValue) {
return new SortedNumericDocValuesRangeQuery(field, lowerValue, upperValue) {
@Override
SortedNumericDocValues getValues(LeafReader reader, String field) throws IOException {
@@ -99,7 +99,7 @@ public class NumericDocValuesField extends Field {
* alongside a range query that executes on points, such as
* {@link LongPoint#newExactQuery}.
*/
- public static Query newExactQuery(String field, long value) {
- return newRangeQuery(field, value, value);
+ public static Query newSlowExactQuery(String field, long value) {
+ return newSlowRangeQuery(field, value, value);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1e6e4022/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesField.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesField.java b/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesField.java
index 6f9a271..bbb1da7 100644
--- a/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesField.java
+++ b/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesField.java
@@ -89,7 +89,7 @@ public class SortedNumericDocValuesField extends Field {
* alongside a range query that executes on points, such as
* {@link LongPoint#newRangeQuery}.
*/
- public static Query newRangeQuery(String field, long lowerValue, long upperValue) {
+ public static Query newSlowRangeQuery(String field, long lowerValue, long upperValue) {
return new SortedNumericDocValuesRangeQuery(field, lowerValue, upperValue) {
@Override
SortedNumericDocValues getValues(LeafReader reader, String field) throws IOException {
@@ -114,7 +114,7 @@ public class SortedNumericDocValuesField extends Field {
* alongside a range query that executes on points, such as
* {@link LongPoint#newExactQuery}.
*/
- public static Query newExactQuery(String field, long value) {
- return newRangeQuery(field, value, value);
+ public static Query newSlowExactQuery(String field, long value) {
+ return newSlowRangeQuery(field, value, value);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1e6e4022/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java
index 6cb0460..0591278 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java
@@ -80,9 +80,9 @@ public class TestDocValuesQueries extends LuceneTestCase {
final Query q1 = LongPoint.newRangeQuery("idx", min, max);
final Query q2;
if (sortedNumeric) {
- q2 = SortedNumericDocValuesField.newRangeQuery("dv", min, max);
+ q2 = SortedNumericDocValuesField.newSlowRangeQuery("dv", min, max);
} else {
- q2 = NumericDocValuesField.newRangeQuery("dv", min, max);
+ q2 = NumericDocValuesField.newSlowRangeQuery("dv", min, max);
}
assertSameMatches(searcher, q1, q2, false);
}
@@ -185,11 +185,11 @@ public class TestDocValuesQueries extends LuceneTestCase {
}
public void testEquals() {
- Query q1 = SortedNumericDocValuesField.newRangeQuery("foo", 3, 5);
- QueryUtils.checkEqual(q1, SortedNumericDocValuesField.newRangeQuery("foo", 3, 5));
- QueryUtils.checkUnequal(q1, SortedNumericDocValuesField.newRangeQuery("foo", 3, 6));
- QueryUtils.checkUnequal(q1, SortedNumericDocValuesField.newRangeQuery("foo", 4, 5));
- QueryUtils.checkUnequal(q1, SortedNumericDocValuesField.newRangeQuery("bar", 3, 5));
+ Query q1 = SortedNumericDocValuesField.newSlowRangeQuery("foo", 3, 5);
+ QueryUtils.checkEqual(q1, SortedNumericDocValuesField.newSlowRangeQuery("foo", 3, 5));
+ QueryUtils.checkUnequal(q1, SortedNumericDocValuesField.newSlowRangeQuery("foo", 3, 6));
+ QueryUtils.checkUnequal(q1, SortedNumericDocValuesField.newSlowRangeQuery("foo", 4, 5));
+ QueryUtils.checkUnequal(q1, SortedNumericDocValuesField.newSlowRangeQuery("bar", 3, 5));
Query q2 = SortedSetDocValuesField.newRangeQuery("foo", new BytesRef("bar"), new BytesRef("baz"), true, true);
QueryUtils.checkEqual(q2, SortedSetDocValuesField.newRangeQuery("foo", new BytesRef("bar"), new BytesRef("baz"), true, true));
@@ -199,7 +199,7 @@ public class TestDocValuesQueries extends LuceneTestCase {
}
public void testToString() {
- Query q1 = SortedNumericDocValuesField.newRangeQuery("foo", 3, 5);
+ Query q1 = SortedNumericDocValuesField.newSlowRangeQuery("foo", 3, 5);
assertEquals("foo:[3 TO 5]", q1.toString());
assertEquals("[3 TO 5]", q1.toString("foo"));
assertEquals("foo:[3 TO 5]", q1.toString("bar"));
@@ -226,8 +226,8 @@ public class TestDocValuesQueries extends LuceneTestCase {
iw.close();
IndexSearcher searcher = newSearcher(reader);
for (Query query : Arrays.asList(
- NumericDocValuesField.newRangeQuery("foo", 2, 4),
- SortedNumericDocValuesField.newRangeQuery("foo", 2, 4),
+ NumericDocValuesField.newSlowRangeQuery("foo", 2, 4),
+ SortedNumericDocValuesField.newSlowRangeQuery("foo", 2, 4),
SortedDocValuesField.newRangeQuery("foo", new BytesRef("abc"), new BytesRef("bcd"), random().nextBoolean(), random().nextBoolean()),
SortedSetDocValuesField.newRangeQuery("foo", new BytesRef("abc"), new BytesRef("bcd"), random().nextBoolean(), random().nextBoolean()))) {
Weight w = searcher.createNormalizedWeight(query, random().nextBoolean());
@@ -255,12 +255,12 @@ public class TestDocValuesQueries extends LuceneTestCase {
final long lo = NumericUtils.doubleToSortableLong(8.701032080293731E-226);
final long hi = NumericUtils.doubleToSortableLong(2.0801416404385346E-41);
- Query query = SortedNumericDocValuesField.newRangeQuery("dv", lo, hi);
+ Query query = SortedNumericDocValuesField.newSlowRangeQuery("dv", lo, hi);
// TODO: assert expected matches
searcher.search(query, searcher.reader.maxDoc(), Sort.INDEXORDER);
// swap order, should still work
- query = SortedNumericDocValuesField.newRangeQuery("dv", hi, lo);
+ query = SortedNumericDocValuesField.newSlowRangeQuery("dv", hi, lo);
// TODO: assert expected matches
searcher.search(query, searcher.reader.maxDoc(), Sort.INDEXORDER);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1e6e4022/lucene/core/src/test/org/apache/lucene/search/TestIndexOrDocValuesQuery.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestIndexOrDocValuesQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestIndexOrDocValuesQuery.java
index 8b81822..7f3e599 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestIndexOrDocValuesQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestIndexOrDocValuesQuery.java
@@ -64,7 +64,7 @@ public class TestIndexOrDocValuesQuery extends LuceneTestCase {
// The term query is more selective, so the IndexOrDocValuesQuery should use doc values
final Query q1 = new BooleanQuery.Builder()
.add(new TermQuery(new Term("f1", "foo")), Occur.MUST)
- .add(new IndexOrDocValuesQuery(LongPoint.newExactQuery("f2", 2), NumericDocValuesField.newRangeQuery("f2", 2L, 2L)), Occur.MUST)
+ .add(new IndexOrDocValuesQuery(LongPoint.newExactQuery("f2", 2), NumericDocValuesField.newSlowRangeQuery("f2", 2L, 2L)), Occur.MUST)
.build();
final Weight w1 = searcher.createNormalizedWeight(q1, random().nextBoolean());
@@ -74,7 +74,7 @@ public class TestIndexOrDocValuesQuery extends LuceneTestCase {
// The term query is less selective, so the IndexOrDocValuesQuery should use points
final Query q2 = new BooleanQuery.Builder()
.add(new TermQuery(new Term("f1", "bar")), Occur.MUST)
- .add(new IndexOrDocValuesQuery(LongPoint.newExactQuery("f2", 42), NumericDocValuesField.newRangeQuery("f2", 42L, 42L)), Occur.MUST)
+ .add(new IndexOrDocValuesQuery(LongPoint.newExactQuery("f2", 42), NumericDocValuesField.newSlowRangeQuery("f2", 42L, 42L)), Occur.MUST)
.build();
final Weight w2 = searcher.createNormalizedWeight(q2, random().nextBoolean());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1e6e4022/lucene/sandbox/src/java/org/apache/lucene/document/LatLonDocValuesField.java
----------------------------------------------------------------------
diff --git a/lucene/sandbox/src/java/org/apache/lucene/document/LatLonDocValuesField.java b/lucene/sandbox/src/java/org/apache/lucene/document/LatLonDocValuesField.java
index 10e90b4..6bcc394 100644
--- a/lucene/sandbox/src/java/org/apache/lucene/document/LatLonDocValuesField.java
+++ b/lucene/sandbox/src/java/org/apache/lucene/document/LatLonDocValuesField.java
@@ -143,7 +143,7 @@ public class LatLonDocValuesField extends Field {
* best used wrapped in an {@link IndexOrDocValuesQuery} alongside a
* {@link LatLonPoint#newBoxQuery}.
*/
- public static Query newBoxQuery(String field, double minLatitude, double maxLatitude, double minLongitude, double maxLongitude) {
+ public static Query newSlowBoxQuery(String field, double minLatitude, double maxLatitude, double minLongitude, double maxLongitude) {
// exact double values of lat=90.0D and lon=180.0D must be treated special as they are not represented in the encoding
// and should not drag in extra bogus junk! TODO: should encodeCeil just throw ArithmeticException to be less trappy here?
if (minLatitude == 90.0) {
@@ -175,7 +175,7 @@ public class LatLonDocValuesField extends Field {
* @return query matching points within this distance
* @throws IllegalArgumentException if {@code field} is null, location has invalid coordinates, or radius is invalid.
*/
- public static Query newDistanceQuery(String field, double latitude, double longitude, double radiusMeters) {
+ public static Query newSlowDistanceQuery(String field, double latitude, double longitude, double radiusMeters) {
return new LatLonDocValuesDistanceQuery(field, latitude, longitude, radiusMeters);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1e6e4022/lucene/sandbox/src/test/org/apache/lucene/search/TestLatLonDocValuesQueries.java
----------------------------------------------------------------------
diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestLatLonDocValuesQueries.java b/lucene/sandbox/src/test/org/apache/lucene/search/TestLatLonDocValuesQueries.java
index 3c8bf4e..bf1b8cb 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/search/TestLatLonDocValuesQueries.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/search/TestLatLonDocValuesQueries.java
@@ -36,12 +36,12 @@ public class TestLatLonDocValuesQueries extends BaseGeoPointTestCase {
@Override
protected Query newRectQuery(String field, double minLat, double maxLat, double minLon, double maxLon) {
- return LatLonDocValuesField.newBoxQuery(field, minLat, maxLat, minLon, maxLon);
+ return LatLonDocValuesField.newSlowBoxQuery(field, minLat, maxLat, minLon, maxLon);
}
@Override
protected Query newDistanceQuery(String field, double centerLat, double centerLon, double radiusMeters) {
- return LatLonDocValuesField.newDistanceQuery(field, centerLat, centerLon, radiusMeters);
+ return LatLonDocValuesField.newSlowDistanceQuery(field, centerLat, centerLon, radiusMeters);
}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1e6e4022/solr/core/src/java/org/apache/solr/schema/EnumField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/EnumField.java b/solr/core/src/java/org/apache/solr/schema/EnumField.java
index f023805..60e65d5 100644
--- a/solr/core/src/java/org/apache/solr/schema/EnumField.java
+++ b/solr/core/src/java/org/apache/solr/schema/EnumField.java
@@ -266,7 +266,7 @@ public class EnumField extends PrimitiveFieldType {
--upperValue;
}
}
- query = new ConstantScoreQuery(NumericDocValuesField.newRangeQuery(field.getName(), lowerValue, upperValue));
+ query = new ConstantScoreQuery(NumericDocValuesField.newSlowRangeQuery(field.getName(), lowerValue, upperValue));
} else {
query = LegacyNumericRangeQuery.newIntRange(field.getName(), DEFAULT_PRECISION_STEP,
min == null ? null : minValue,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1e6e4022/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java b/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java
index 87f32d9..773e8a7 100644
--- a/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java
+++ b/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java
@@ -155,16 +155,16 @@ public class LatLonPointSpatialField extends AbstractSpatialFieldType implements
if (shape instanceof Circle) {
Circle circle = (Circle) shape;
double radiusMeters = circle.getRadius() * DistanceUtils.DEG_TO_KM * 1000;
- return LatLonDocValuesField.newDistanceQuery(getFieldName(),
+ return LatLonDocValuesField.newSlowDistanceQuery(getFieldName(),
circle.getCenter().getY(), circle.getCenter().getX(),
radiusMeters);
} else if (shape instanceof Rectangle) {
Rectangle rect = (Rectangle) shape;
- return LatLonDocValuesField.newBoxQuery(getFieldName(),
+ return LatLonDocValuesField.newSlowBoxQuery(getFieldName(),
rect.getMinY(), rect.getMaxY(), rect.getMinX(), rect.getMaxX());
} else if (shape instanceof Point) {
Point point = (Point) shape;
- return LatLonDocValuesField.newDistanceQuery(getFieldName(),
+ return LatLonDocValuesField.newSlowDistanceQuery(getFieldName(),
point.getY(), point.getX(), 0);
} else {
throw new UnsupportedOperationException("Shape " + shape.getClass() + " is not supported by " + getClass());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1e6e4022/solr/core/src/java/org/apache/solr/schema/NumericFieldType.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/NumericFieldType.java b/solr/core/src/java/org/apache/solr/schema/NumericFieldType.java
index cf17aaf..c79f465 100644
--- a/solr/core/src/java/org/apache/solr/schema/NumericFieldType.java
+++ b/solr/core/src/java/org/apache/solr/schema/NumericFieldType.java
@@ -164,9 +164,9 @@ public abstract class NumericFieldType extends PrimitiveFieldType {
}
if (multiValued) {
// In multiValued case use SortedNumericDocValuesField, this won't work for Trie*Fields wince they use BinaryDV in the multiValue case
- return SortedNumericDocValuesField.newRangeQuery(field, actualLowerValue, actualUpperValue);
+ return SortedNumericDocValuesField.newSlowRangeQuery(field, actualLowerValue, actualUpperValue);
} else {
- return NumericDocValuesField.newRangeQuery(field, actualLowerValue, actualUpperValue);
+ return NumericDocValuesField.newSlowRangeQuery(field, actualLowerValue, actualUpperValue);
}
}
[4/5] lucene-solr:jira/solr-10879: SOLR-10878: Fix precommit.
Posted by ab...@apache.org.
SOLR-10878: Fix precommit.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ddfa0742
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ddfa0742
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ddfa0742
Branch: refs/heads/jira/solr-10879
Commit: ddfa074214dc1e1a3aa53fdcb387796aadbcb914
Parents: 1e6e402
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue Jul 4 19:46:10 2017 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue Jul 4 19:46:30 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/solr/cloud/MoveReplicaCmd.java | 1 -
.../org/apache/solr/cloud/MoveReplicaHDFSTest.java | 16 ++++++++++++++++
.../test/org/apache/solr/cloud/MoveReplicaTest.java | 1 -
3 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ddfa0742/solr/core/src/java/org/apache/solr/cloud/MoveReplicaCmd.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/MoveReplicaCmd.java b/solr/core/src/java/org/apache/solr/cloud/MoveReplicaCmd.java
index 53d05e1..4d6e26d 100644
--- a/solr/core/src/java/org/apache/solr/cloud/MoveReplicaCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/MoveReplicaCmd.java
@@ -31,7 +31,6 @@ import org.apache.solr.common.cloud.DocCollection;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkNodeProps;
-import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.CoreAdminParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.Utils;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ddfa0742/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java
index 884d49e..dc6318b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaHDFSTest.java
@@ -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.cloud;
import com.carrotsearch.randomizedtesting.ThreadFilter;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ddfa0742/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
index 8f00431..930e8ee 100644
--- a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
@@ -35,7 +35,6 @@ import org.apache.solr.client.solrj.response.RequestStatusState;
import org.apache.solr.common.cloud.DocCollection;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice;
-import org.apache.solr.common.cloud.ZkStateReader;
import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;