You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2015/04/02 17:37:41 UTC
svn commit: r1670929 [5/5] - in /lucene/dev/branches/lucene6271: ./ lucene/
lucene/codecs/ lucene/codecs/src/java/org/apache/lucene/codecs/autoprefix/
lucene/codecs/src/resources/META-INF/services/
lucene/codecs/src/test/org/apache/lucene/codecs/autopr...
Modified: lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java?rev=1670929&r1=1670928&r2=1670929&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java (original)
+++ lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java Thu Apr 2 15:37:39 2015
@@ -18,6 +18,11 @@ package org.apache.solr.request.json;
*/
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.commons.io.IOUtils;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.ModifiableSolrParams;
@@ -25,7 +30,6 @@ import org.apache.solr.common.params.Mul
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.common.util.StrUtils;
-import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.component.SearchHandler;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrRequestHandler;
@@ -33,10 +37,7 @@ import org.apache.solr.request.macro.Mac
import org.noggit.JSONParser;
import org.noggit.ObjectBuilder;
-import java.io.IOException;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import static org.apache.solr.common.params.CommonParams.JSON;
public class RequestUtil {
/**
@@ -65,7 +66,7 @@ public class RequestUtil {
req.setParams(params);
}
- String[] jsonFromParams = map.remove("json"); // params from the query string should come after (and hence override) JSON content streams
+ String[] jsonFromParams = map.remove(JSON); // params from the query string should come after (and hence override) JSON content streams
for (ContentStream cs : req.getContentStreams()) {
String contentType = cs.getContentType();
@@ -75,7 +76,7 @@ public class RequestUtil {
try {
String jsonString = IOUtils.toString( cs.getReader() );
- MultiMapSolrParams.addParam("json", jsonString, map);
+ MultiMapSolrParams.addParam(JSON, jsonString, map);
} catch (IOException e) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Exception reading content stream for request:"+req, e);
}
@@ -84,12 +85,12 @@ public class RequestUtil {
// append existing "json" params
if (jsonFromParams != null) {
for (String json : jsonFromParams) {
- MultiMapSolrParams.addParam("json", json, map);
+ MultiMapSolrParams.addParam(JSON, json, map);
}
}
}
- String[] jsonS = params.getParams("json");
+ String[] jsonS = params.getParams(JSON);
boolean hasAdditions = defaults != null || invariants != null || appends != null || jsonS != null;
@@ -168,12 +169,12 @@ public class RequestUtil {
Map<String, Object> json = null;
// Handle JSON body first, so query params will always overlay on that
- jsonS = newMap.get("json");
+ jsonS = newMap.get(JSON);
if (jsonS != null) {
if (json == null) {
json = new LinkedHashMap<>();
}
- mergeJSON(json, "json", jsonS, new ObjectUtil.ConflictHandler());
+ mergeJSON(json, JSON, jsonS, new ObjectUtil.ConflictHandler());
}
for (String key : newMap.keySet()) {
// json.nl, json.wrf are existing query parameters
Modified: lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java?rev=1670929&r1=1670928&r2=1670929&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java (original)
+++ lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java Thu Apr 2 15:37:39 2015
@@ -36,6 +36,8 @@ import org.apache.solr.search.ReturnFiel
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.solr.common.params.CommonParams.NAME;
+
/**
* @lucene.internal
*/
@@ -327,7 +329,7 @@ public class SchemaXmlWriter extends Tex
writer.write('<');
writer.write(tag);
if (name!=null) {
- writeAttr("name", name);
+ writeAttr(NAME, name);
if (closeTag) {
writer.write("/>");
} else {
Modified: lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/response/XMLWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/response/XMLWriter.java?rev=1670929&r1=1670928&r2=1670929&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/response/XMLWriter.java (original)
+++ lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/response/XMLWriter.java Thu Apr 2 15:37:39 2015
@@ -33,6 +33,8 @@ import org.apache.solr.request.SolrQuery
import org.apache.solr.search.ReturnFields;
import org.apache.solr.search.SolrReturnFields;
+import static org.apache.solr.common.params.CommonParams.NAME;
+
/**
* @lucene.internal
@@ -144,7 +146,7 @@ public class XMLWriter extends TextRespo
writer.write('<');
writer.write(tag);
if (name!=null) {
- writeAttr("name", name);
+ writeAttr(NAME, name);
if (closeTag) {
writer.write("/>");
} else {
@@ -167,7 +169,7 @@ public class XMLWriter extends TextRespo
if (doIndent) indent();
writer.write("<result");
- writeAttr("name",name);
+ writeAttr(NAME, name);
writeAttr("numFound",Long.toString(numFound));
writeAttr("start",Long.toString(start));
if(maxScore!=null) {
Modified: lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java?rev=1670929&r1=1670928&r2=1670929&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java (original)
+++ lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java Thu Apr 2 15:37:39 2015
@@ -16,6 +16,11 @@ package org.apache.solr.rest;
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
@@ -36,11 +41,7 @@ import org.restlet.resource.ResourceExce
import org.restlet.resource.ServerResource;
import org.slf4j.Logger;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-
+import static org.apache.solr.common.params.CommonParams.JSON;
/**
* Base class of all Solr Restlet server resource classes.
@@ -103,7 +104,7 @@ public abstract class BaseSolrResource e
schema = solrRequest.getSchema();
String responseWriterName = solrRequest.getParams().get(CommonParams.WT);
if (null == responseWriterName) {
- responseWriterName = "json"; // Default to json writer
+ responseWriterName = JSON; // Default to json writer
}
String indent = solrRequest.getParams().get("indent");
if (null == indent || ! ("off".equals(indent) || "false".equals(indent))) {
Modified: lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java?rev=1670929&r1=1670928&r2=1670929&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java (original)
+++ lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java Thu Apr 2 15:37:39 2015
@@ -17,27 +17,37 @@
package org.apache.solr.schema;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.core.KeywordAnalyzer;
import org.apache.lucene.analysis.core.KeywordTokenizerFactory;
-import org.apache.lucene.analysis.util.*;
+import org.apache.lucene.analysis.util.AbstractAnalysisFactory;
+import org.apache.lucene.analysis.util.CharFilterFactory;
+import org.apache.lucene.analysis.util.MultiTermAwareComponent;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
+import org.apache.lucene.analysis.util.TokenizerFactory;
import org.apache.lucene.util.Version;
import org.apache.solr.analysis.TokenizerChain;
import org.apache.solr.common.SolrException;
-import org.apache.solr.util.DOMUtil;
import org.apache.solr.core.Config;
import org.apache.solr.core.SolrResourceLoader;
+import org.apache.solr.util.DOMUtil;
import org.apache.solr.util.plugin.AbstractPluginLoader;
-import org.w3c.dom.*;
-
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-import java.util.*;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import static org.apache.solr.common.params.CommonParams.NAME;
public final class FieldTypePluginLoader
extends AbstractPluginLoader<FieldType> {
@@ -136,7 +146,7 @@ public final class FieldTypePluginLoader
@Override
protected void init(FieldType plugin, Node node) throws Exception {
- Map<String,String> params = DOMUtil.toMapExcept( node.getAttributes(), "name");
+ Map<String, String> params = DOMUtil.toMapExcept(node.getAttributes(), NAME);
plugin.setArgs(schema, params);
}
Modified: lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java?rev=1670929&r1=1670928&r2=1670929&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java (original)
+++ lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java Thu Apr 2 15:37:39 2015
@@ -44,6 +44,8 @@ import org.apache.solr.search.Sorting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.solr.common.params.CommonParams.JSON;
+
/**
* Pre-analyzed field type provides a way to index a serialized token stream,
* optionally with an independent stored value of a field.
@@ -70,7 +72,7 @@ public class PreAnalyzedField extends Fi
parser = new JsonPreAnalyzedParser();
} else {
// short name
- if ("json".equalsIgnoreCase(implName)) {
+ if (JSON.equalsIgnoreCase(implName)) {
parser = new JsonPreAnalyzedParser();
} else if ("simple".equalsIgnoreCase(implName)) {
parser = new SimplePreAnalyzedParser();
Modified: lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/search/CacheConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/search/CacheConfig.java?rev=1670929&r1=1670928&r2=1670929&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/search/CacheConfig.java (original)
+++ lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/search/CacheConfig.java Thu Apr 2 15:37:39 2015
@@ -17,22 +17,22 @@
package org.apache.solr.search;
-import org.apache.solr.common.util.StrUtils;
-import org.apache.solr.core.MapSerializable;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
+import javax.xml.xpath.XPathConstants;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.solr.common.SolrException;
-import org.apache.solr.util.DOMUtil;
+import org.apache.solr.common.util.StrUtils;
+import org.apache.solr.core.MapSerializable;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrResourceLoader;
+import org.apache.solr.util.DOMUtil;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
-import javax.xml.xpath.XPathConstants;
+import static org.apache.solr.common.params.CommonParams.NAME;
/**
* Contains the knowledge of how cache config is
@@ -106,9 +106,9 @@ public class CacheConfig implements MapS
}
config.args = mapCopy;
}
- String nameAttr = config.args.get("name"); // OPTIONAL
+ String nameAttr = config.args.get(NAME); // OPTIONAL
if (nameAttr==null) {
- config.args.put("name",config.nodeName);
+ config.args.put(NAME, config.nodeName);
}
SolrResourceLoader loader = solrConfig.getResourceLoader();
Modified: lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/search/LFUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/search/LFUCache.java?rev=1670929&r1=1670928&r2=1670929&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/search/LFUCache.java (original)
+++ lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/search/LFUCache.java Thu Apr 2 15:37:39 2015
@@ -16,12 +16,6 @@ package org.apache.solr.search;
* limitations under the License.
*/
-import org.apache.solr.common.SolrException;
-import org.apache.solr.common.util.NamedList;
-import org.apache.solr.common.util.SimpleOrderedMap;
-import org.apache.solr.core.SolrCore;
-import org.apache.solr.util.ConcurrentLFUCache;
-
import java.io.Serializable;
import java.net.URL;
import java.util.List;
@@ -30,6 +24,14 @@ import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit;
+import org.apache.solr.common.SolrException;
+import org.apache.solr.common.util.NamedList;
+import org.apache.solr.common.util.SimpleOrderedMap;
+import org.apache.solr.core.SolrCore;
+import org.apache.solr.util.ConcurrentLFUCache;
+
+import static org.apache.solr.common.params.CommonParams.NAME;
+
/**
* SolrCache based on ConcurrentLFUCache implementation.
* <p>
@@ -64,7 +66,7 @@ public class LFUCache<K, V> implements S
public Object init(Map args, Object persistence, CacheRegenerator regenerator) {
state = State.CREATED;
this.regenerator = regenerator;
- name = (String) args.get("name");
+ name = (String) args.get(NAME);
String str = (String) args.get("size");
int limit = str == null ? 1024 : Integer.parseInt(str);
int minLimit;
Modified: lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/search/SolrCacheBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/search/SolrCacheBase.java?rev=1670929&r1=1670928&r2=1670929&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/search/SolrCacheBase.java (original)
+++ lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/search/SolrCacheBase.java Thu Apr 2 15:37:39 2015
@@ -17,17 +17,17 @@
package org.apache.solr.search;
-import java.io.Serializable;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.URL;
import java.util.Map;
-
-import org.apache.solr.common.util.NamedList;
+
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrInfoMBean.Category;
import org.apache.solr.search.SolrCache.State;
+import static org.apache.solr.common.params.CommonParams.NAME;
+
/**
* Common base class of reusable functionality for SolrCaches
*/
@@ -113,9 +113,9 @@ public abstract class SolrCacheBase {
public void init(Map<String, String> args, CacheRegenerator regenerator) {
this.regenerator = regenerator;
- state=State.CREATED;
- name = (String) args.get("name");
- autowarm = new AutoWarmCountRef((String)args.get("autowarmCount"));
+ state = State.CREATED;
+ name = args.get(NAME);
+ autowarm = new AutoWarmCountRef(args.get("autowarmCount"));
}
Modified: lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java?rev=1670929&r1=1670928&r2=1670929&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java (original)
+++ lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java Thu Apr 2 15:37:39 2015
@@ -17,6 +17,7 @@
package org.apache.solr.servlet;
+import javax.servlet.http.HttpServletRequest;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
@@ -35,11 +36,8 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
@@ -52,7 +50,6 @@ import org.apache.solr.common.params.Sol
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.common.util.ContentStreamBase;
import org.apache.solr.common.util.FastInputStream;
-import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.RequestHandlers;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrCore;
@@ -62,6 +59,8 @@ import org.apache.solr.util.RTimer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.solr.common.params.CommonParams.PATH;
+
public class SolrRequestParsers
{
@@ -163,7 +162,7 @@ public class SolrRequestParsers
// Handlers and login will want to know the path. If it contains a ':'
// the handler could use it for RESTful URLs
- sreq.getContext().put( "path", RequestHandlers.normalize(path) );
+ sreq.getContext().put(PATH, RequestHandlers.normalize(path));
sreq.getContext().put("httpMethod", req.getMethod());
if(addHttpRequestToContext) {
Modified: lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java?rev=1670929&r1=1670928&r2=1670929&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java (original)
+++ lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/servlet/ZookeeperInfoServlet.java Thu Apr 2 15:37:39 2015
@@ -17,6 +17,9 @@
package org.apache.solr.servlet;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
@@ -32,12 +35,8 @@ import java.util.Map;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
-import java.util.regex.Pattern;
import java.util.regex.Matcher;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.regex.Pattern;
import org.apache.lucene.util.BytesRef;
import org.apache.solr.cloud.ZkController;
@@ -60,6 +59,7 @@ import org.noggit.ObjectBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.solr.common.params.CommonParams.PATH;
/**
@@ -354,7 +354,7 @@ public final class ZookeeperInfoServlet
return;
}
- String path = params.get("path");
+ String path = params.get(PATH);
String addr = params.get("addr");
if (addr != null && addr.length() == 0) {
@@ -785,7 +785,7 @@ public final class ZookeeperInfoServlet
json.writeNameSeparator();
json.startObject();
- writeKeyValue(json, "path", path, true);
+ writeKeyValue(json, PATH, path, true);
json.writeValueSeparator();
json.writeString("prop");
Modified: lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java?rev=1670929&r1=1670928&r2=1670929&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java (original)
+++ lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java Thu Apr 2 15:37:39 2015
@@ -37,6 +37,8 @@ import org.apache.solr.search.SolrIndexS
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.solr.common.params.CommonParams.NAME;
+
/**
* Responsible for loading the lookup and dictionary Implementations specified by
* the SolrConfig.
@@ -49,9 +51,6 @@ public class SolrSuggester implements Ac
/** Name used when an unnamed suggester config is passed */
public static final String DEFAULT_DICT_NAME = "default";
- /** Label to identify the name of the suggester */
- public static final String NAME = "name";
-
/** Location of the source data - either a path to a file, or null for the
* current IndexReader.
* */
Modified: lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/util/DOMUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/util/DOMUtil.java?rev=1670929&r1=1670928&r2=1670929&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/util/DOMUtil.java (original)
+++ lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/util/DOMUtil.java Thu Apr 2 15:37:39 2015
@@ -17,7 +17,12 @@ package org.apache.solr.util;
* limitations under the License.
*/
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
@@ -26,6 +31,8 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import static org.apache.solr.common.params.CommonParams.NAME;
+
/**
*
*/
@@ -137,7 +144,7 @@ public class DOMUtil {
final String type = nd.getNodeName();
- final String name = getAttr(nd, "name");
+ final String name = getAttr(nd, NAME);
Object val=null;
Modified: lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/util/SolrCLI.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/util/SolrCLI.java?rev=1670929&r1=1670928&r2=1670929&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/util/SolrCLI.java (original)
+++ lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/util/SolrCLI.java Thu Apr 2 15:37:39 2015
@@ -17,6 +17,25 @@ package org.apache.solr.util;
* limitations under the License.
*/
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.net.ConnectException;
+import java.net.SocketException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.GnuParser;
import org.apache.commons.cli.HelpFormatter;
@@ -53,30 +72,14 @@ import org.apache.solr.common.cloud.Repl
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkCoreNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.noggit.CharArr;
import org.noggit.JSONParser;
import org.noggit.JSONWriter;
import org.noggit.ObjectBuilder;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.net.ConnectException;
-import java.net.SocketException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
+import static org.apache.solr.common.params.CommonParams.NAME;
/**
* Command-line utility for working with Solr.
@@ -498,7 +501,7 @@ public class SolrCLI {
@SuppressWarnings({"unchecked"})
public static Map<String,Object> getJson(HttpClient httpClient, String getUrl) throws Exception {
// ensure we're requesting JSON back from Solr
- HttpGet httpGet = new HttpGet(new URIBuilder(getUrl).setParameter("wt", "json").build());
+ HttpGet httpGet = new HttpGet(new URIBuilder(getUrl).setParameter(CommonParams.WT, CommonParams.JSON).build());
// make the request and get back a parsed JSON object
Map<String,Object> json = httpClient.execute(httpGet, new SolrResponseHandler());
// check the response JSON from Solr to see if it is an error
@@ -793,7 +796,7 @@ public class SolrCLI {
public Map<String,Object> asMap() {
Map<String,Object> map = new LinkedHashMap<String,Object>();
- map.put("name", name);
+ map.put(NAME, name);
map.put("url", url);
map.put("numDocs", numDocs);
map.put("status", status);
@@ -1043,7 +1046,7 @@ public class SolrCLI {
.hasArg()
.isRequired(true)
.withDescription("Name of collection to create.")
- .create("name"),
+ .create(NAME),
OptionBuilder
.withArgName("#")
.hasArg()
@@ -1177,7 +1180,7 @@ public class SolrCLI {
"there is at least 1 live node in the cluster.");
String firstLiveNode = liveNodes.iterator().next();
- String collectionName = cli.getOptionValue("name");
+ String collectionName = cli.getOptionValue(NAME);
// build a URL to create the collection
int numShards = optionAsInt(cli, "shards", 1);
@@ -1322,7 +1325,7 @@ public class SolrCLI {
.hasArg()
.isRequired(true)
.withDescription("Name of the core to create.")
- .create("name"),
+ .create(NAME),
OptionBuilder
.withArgName("CONFIG")
.hasArg()
@@ -1362,7 +1365,7 @@ public class SolrCLI {
}
}
- String coreName = cli.getOptionValue("name");
+ String coreName = cli.getOptionValue(NAME);
String systemInfoUrl = solrUrl+"admin/info/system";
CloseableHttpClient httpClient = getHttpClient();
@@ -1453,7 +1456,7 @@ public class SolrCLI {
Map<String,Object> existsCheckResult = getJson(coreStatusUrl);
Map<String,Object> status = (Map<String, Object>)existsCheckResult.get("status");
Map<String,Object> coreStatus = (Map<String, Object>)status.get(coreName);
- exists = coreStatus != null && coreStatus.containsKey("name");
+ exists = coreStatus != null && coreStatus.containsKey(NAME);
} catch (Exception exc) {
// just ignore it since we're only interested in a positive result here
}
@@ -1529,7 +1532,7 @@ public class SolrCLI {
.hasArg()
.isRequired(true)
.withDescription("Name of the core / collection to delete.")
- .create("name"),
+ .create(NAME),
OptionBuilder
.withArgName("true|false")
.hasArg()
@@ -1610,7 +1613,7 @@ public class SolrCLI {
ZkStateReader zkStateReader = cloudSolrClient.getZkStateReader();
String baseUrl = zkStateReader.getBaseUrlForNodeName(firstLiveNode);
- String collectionName = cli.getOptionValue("name");
+ String collectionName = cli.getOptionValue(NAME);
if (!zkStateReader.getClusterState().hasCollection(collectionName)) {
System.err.println("\nERROR: Collection "+collectionName+" not found!");
@@ -1686,7 +1689,7 @@ public class SolrCLI {
protected int deleteCore(CommandLine cli, CloseableHttpClient httpClient, String solrUrl) throws Exception {
int status = 0;
- String coreName = cli.getOptionValue("name");
+ String coreName = cli.getOptionValue(NAME);
String deleteCoreUrl =
String.format(Locale.ROOT,
"%sadmin/cores?action=UNLOAD&core=%s&deleteIndex=true&deleteDataDir=true&deleteInstanceDir=true",
Modified: lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java?rev=1670929&r1=1670928&r2=1670929&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java (original)
+++ lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java Thu Apr 2 15:37:39 2015
@@ -19,17 +19,18 @@ package org.apache.solr.util.plugin;
import java.util.ArrayList;
import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
-import org.apache.solr.util.DOMUtil;
-import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrResourceLoader;
+import org.apache.solr.util.DOMUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import static org.apache.solr.common.params.CommonParams.NAME;
+
/**
* An abstract super class that manages standard solr-style plugin configuration.
*
@@ -144,7 +145,7 @@ public abstract class AbstractPluginLoad
String name = null;
try {
- name = DOMUtil.getAttr(node,"name", requireName?type:null);
+ name = DOMUtil.getAttr(node, NAME, requireName ? type : null);
String className = DOMUtil.getAttr(node,"class", type);
String defaultStr = DOMUtil.getAttr(node,"default", null );
@@ -222,7 +223,7 @@ public abstract class AbstractPluginLoad
T plugin = null;
try {
- String name = DOMUtil.getAttr(node, "name", requireName ? type : null);
+ String name = DOMUtil.getAttr(node, NAME, requireName ? type : null);
String className = DOMUtil.getAttr(node, "class", type);
plugin = create(loader, name, className, node);
log.debug("created " + name + ": " + plugin.getClass().getName());
@@ -265,13 +266,11 @@ public abstract class AbstractPluginLoad
* Internal class to hold onto initialization info so that it can be initialized
* after it is registered.
*/
- private class PluginInitInfo
- {
+ private class PluginInitInfo {
final T plugin;
final Node node;
-
- PluginInitInfo( T plugin, Node node )
- {
+
+ PluginInitInfo(T plugin, Node node) {
this.plugin = plugin;
this.node = node;
}
Modified: lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/util/plugin/MapPluginLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/util/plugin/MapPluginLoader.java?rev=1670929&r1=1670928&r2=1670929&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/util/plugin/MapPluginLoader.java (original)
+++ lucene/dev/branches/lucene6271/solr/core/src/java/org/apache/solr/util/plugin/MapPluginLoader.java Thu Apr 2 15:37:39 2015
@@ -22,6 +22,8 @@ import java.util.Map;
import org.apache.solr.util.DOMUtil;
import org.w3c.dom.Node;
+import static org.apache.solr.common.params.CommonParams.NAME;
+
/**
*
*
@@ -38,7 +40,7 @@ public class MapPluginLoader<T extends M
@Override
protected void init(T plugin, Node node) throws Exception {
- Map<String,String> params = DOMUtil.toMapExcept( node.getAttributes(), "name","class" );
+ Map<String, String> params = DOMUtil.toMapExcept(node.getAttributes(), NAME, "class");
plugin.init( params );
}
Modified: lucene/dev/branches/lucene6271/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java?rev=1670929&r1=1670928&r2=1670929&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java (original)
+++ lucene/dev/branches/lucene6271/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java Thu Apr 2 15:37:39 2015
@@ -66,7 +66,7 @@ public class LeaderInitiatedRecoveryOnCo
}
private void multiShardTest() throws Exception {
- // create a collection that has 1 shard and 3 replicas
+ // create a collection that has 2 shard and 2 replicas
String testCollectionName = "c8n_2x2_commits";
createCollection(testCollectionName, 2, 2, 1);
cloudClient.setDefaultCollection(testCollectionName);
Modified: lucene/dev/branches/lucene6271/solr/server/scripts/cloud-scripts/zkcli.bat
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/solr/server/scripts/cloud-scripts/zkcli.bat?rev=1670929&r1=1670928&r2=1670929&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/solr/server/scripts/cloud-scripts/zkcli.bat (original)
+++ lucene/dev/branches/lucene6271/solr/server/scripts/cloud-scripts/zkcli.bat Thu Apr 2 15:37:39 2015
@@ -10,11 +10,11 @@ set SDIR=%~dp0
if "%SDIR:~-1%"=="\" set SDIR=%SDIR:~0,-1%
IF exist %SDIR%\..\..\solr-webapp\webapp\nul (
- echo %SDIR%\....\..\solr-webapp\webapp exists
+ echo %SDIR%\..\..\solr-webapp\webapp exists
) ELSE (
echo -------------------
- echo Unzip example\webapps\solr.war to example\solr-webapp\. to use this script.
- echo Starting the Solr example via start.jar will also do this extraction.
+ echo Unzip server\webapps\solr.war to server\solr-webapp\. to use this script.
+ echo Starting Solr via "bin\solr.cmd start" will also do this extraction.
echo -------------------
)
Modified: lucene/dev/branches/lucene6271/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6271/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java?rev=1670929&r1=1670928&r2=1670929&view=diff
==============================================================================
--- lucene/dev/branches/lucene6271/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java (original)
+++ lucene/dev/branches/lucene6271/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java Thu Apr 2 15:37:39 2015
@@ -228,5 +228,9 @@ public interface CommonParams {
public static final String JAVABIN = "javabin";
public static final String JSON = "json";
+
+ public static final String PATH = "path";
+
+ public static final String NAME = "name";
}