You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/12/21 12:40:14 UTC
svn commit: r1721134 [26/48] - in /lucene/dev/branches/lucene6835: ./
dev-tools/ dev-tools/eclipse/dot.settings/ dev-tools/idea/.idea/libraries/
dev-tools/maven/ dev-tools/maven/lucene/analysis/morfologik/
dev-tools/scripts/ lucene/ lucene/analysis/ lu...
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/component/StatsField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/component/StatsField.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/component/StatsField.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/component/StatsField.java Mon Dec 21 11:39:57 2015
@@ -30,7 +30,8 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.lang.StringUtils;
-import org.apache.lucene.document.FieldType.NumericType;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.FieldType.LegacyNumericType;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionQuery;
import org.apache.lucene.queries.function.ValueSource;
@@ -637,17 +638,17 @@ public class StatsField {
return null;
}
- final NumericType hashableNumType = getHashableNumericType(field);
+ final FieldType.LegacyNumericType hashableNumType = getHashableNumericType(field);
// some sane defaults
int log2m = 13; // roughly equivilent to "cardinality='0.33'"
int regwidth = 6; // with decent hash, this is plenty for all valid long hashes
- if (NumericType.FLOAT.equals(hashableNumType) || NumericType.INT.equals(hashableNumType)) {
+ if (LegacyNumericType.FLOAT.equals(hashableNumType) || FieldType.LegacyNumericType.INT.equals(hashableNumType)) {
// for 32bit values, we can adjust our default regwidth down a bit
regwidth--;
- // NOTE: EnumField uses NumericType.INT, and in theory we could be super conservative
+ // NOTE: EnumField uses LegacyNumericType.INT, and in theory we could be super conservative
// with it, but there's no point - just let the EXPLICIT HLL handle it
}
@@ -707,7 +708,7 @@ public class StatsField {
if (null == hasher) {
// if this is a function, or a non Long field, pre-hashed is invalid
// NOTE: we ignore hashableNumType - it's LONG for non numerics like Strings
- if (null == field || !NumericType.LONG.equals(field.getType().getNumericType())) {
+ if (null == field || !FieldType.LegacyNumericType.LONG.equals(field.getType().getNumericType())) {
throw new SolrException(ErrorCode.BAD_REQUEST, "hllPreHashed is only supported with Long based fields");
}
}
@@ -740,16 +741,16 @@ public class StatsField {
}
/**
- * Returns the effective {@link NumericType} for the field for the purposes of hash values.
- * ie: If the field has an explict NumericType that is returned; If the field has no explicit
- * NumericType then {@link NumericType#LONG} is returned; If field is null, then
- * {@link NumericType#FLOAT} is assumed for ValueSource.
+ * Returns the effective {@link org.apache.lucene.document.FieldType.LegacyNumericType} for the field for the purposes of hash values.
+ * ie: If the field has an explict LegacyNumericType that is returned; If the field has no explicit
+ * LegacyNumericType then {@link org.apache.lucene.document.FieldType.LegacyNumericType#LONG} is returned; If field is null, then
+ * {@link org.apache.lucene.document.FieldType.LegacyNumericType#FLOAT} is assumed for ValueSource.
*/
- private static NumericType getHashableNumericType(SchemaField field) {
+ private static LegacyNumericType getHashableNumericType(SchemaField field) {
if (null == field) {
- return NumericType.FLOAT;
+ return LegacyNumericType.FLOAT;
}
- final NumericType result = field.getType().getNumericType();
- return null == result ? NumericType.LONG : result;
+ final LegacyNumericType result = field.getType().getNumericType();
+ return null == result ? FieldType.LegacyNumericType.LONG : result;
}
}
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java Mon Dec 21 11:39:57 2015
@@ -19,6 +19,7 @@ package org.apache.solr.handler.componen
import java.io.File;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -62,7 +63,7 @@ import org.slf4j.LoggerFactory;
* and for initializing them as specified by SolrConfig
*/
public class SuggestComponent extends SearchComponent implements SolrCoreAware, SuggesterParams, Accountable {
- private static final Logger LOG = LoggerFactory.getLogger(SuggestComponent.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/** Name used to identify whether the user query concerns this component */
public static final String COMPONENT_NAME = "suggest";
@@ -523,7 +524,7 @@ public class SuggestComponent extends Se
try {
suggester.build(core, newSearcher);
} catch (Exception e) {
- log.error("Exception in building suggester index for: " + suggester.getName(), e);
+ LOG.error("Exception in building suggester index for: " + suggester.getName(), e);
}
}
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java Mon Dec 21 11:39:57 2015
@@ -83,9 +83,12 @@ public class TermVectorComponent extends
public static final String COMPONENT_NAME = "tv";
- protected NamedList initParams;
public static final String TERM_VECTORS = "termVectors";
+ private static final String TV_KEY_WARNINGS = "warnings";
+
+ protected NamedList initParams;
+
/**
* Helper method for determining the list of fields that we should
* try to find term vectors on.
@@ -147,7 +150,6 @@ public class TermVectorComponent extends
String uniqFieldName = null;
if (keyField != null) {
uniqFieldName = keyField.getName();
- termVectors.add("uniqueKeyFieldName", uniqFieldName);
}
FieldOptions allFields = new FieldOptions();
@@ -182,7 +184,7 @@ public class TermVectorComponent extends
//we have specific fields to retrieve, or no fields
for (String field : fields) {
- // workarround SOLR-3523
+ // workaround SOLR-3523
if (null == field || "score".equals(field)) continue;
// we don't want to issue warnings about the uniqueKey field
@@ -226,29 +228,24 @@ public class TermVectorComponent extends
}
} //else, deal with all fields
- // NOTE: currently all typs of warnings are schema driven, and garunteed
+ // NOTE: currently all types of warnings are schema driven, and guaranteed
// to be consistent across all shards - if additional types of warnings
- // are added that might be differnet between shards, finishStage() needs
+ // are added that might be different between shards, finishStage() needs
// to be changed to account for that.
- boolean hasWarnings = false;
if (!noTV.isEmpty()) {
warnings.add("noTermVectors", noTV);
- hasWarnings = true;
}
if (!noPos.isEmpty()) {
warnings.add("noPositions", noPos);
- hasWarnings = true;
}
if (!noOff.isEmpty()) {
warnings.add("noOffsets", noOff);
- hasWarnings = true;
}
if (!noPay.isEmpty()) {
warnings.add("noPayloads", noPay);
- hasWarnings = true;
}
- if (hasWarnings) {
- termVectors.add("warnings", warnings);
+ if (warnings.size() > 0) {
+ termVectors.add(TV_KEY_WARNINGS, warnings);
}
DocListAndSet listAndSet = rb.getResults();
@@ -442,7 +439,7 @@ public class TermVectorComponent extends
public void finishStage(ResponseBuilder rb) {
if (rb.stage == ResponseBuilder.STAGE_GET_FIELDS) {
- NamedList<Object> termVectors = new NamedList<>();
+ NamedList<Object> termVectorsNL = new NamedList<>();
Map.Entry<String, Object>[] arr = new NamedList.NamedListEntry[rb.resultIds.size()];
for (ShardRequest sreq : rb.finished) {
@@ -451,15 +448,19 @@ public class TermVectorComponent extends
}
for (ShardResponse srsp : sreq.responses) {
NamedList<Object> nl = (NamedList<Object>)srsp.getSolrResponse().getResponse().get(TERM_VECTORS);
+
+ // Add metadata (that which isn't a uniqueKey value):
+ Object warningsNL = nl.get(TV_KEY_WARNINGS);
+ // assume if that if warnings is already present; we don't need to merge.
+ if (warningsNL != null && termVectorsNL.indexOf(TV_KEY_WARNINGS, 0) < 0) {
+ termVectorsNL.add(TV_KEY_WARNINGS, warningsNL);
+ }
+
+ // UniqueKey data
for (int i=0; i < nl.size(); i++) {
String key = nl.getName(i);
ShardDoc sdoc = rb.resultIds.get(key);
- if (null == sdoc) {
- // metadata, only need from one node, leave in order
- if (termVectors.indexOf(key,0) < 0) {
- termVectors.add(key, nl.getVal(i));
- }
- } else {
+ if (sdoc != null) {// can be null when rb.onePassDistributedQuery
int idx = sdoc.positionInResponse;
arr[idx] = new NamedList.NamedListEntry<>(key, nl.getVal(i));
}
@@ -467,8 +468,8 @@ public class TermVectorComponent extends
}
}
// remove nulls in case not all docs were able to be retrieved
- termVectors.addAll(SolrPluginUtils.removeNulls(arr, new NamedList<Object>()));
- rb.rsp.add(TERM_VECTORS, termVectors);
+ SolrPluginUtils.removeNulls(arr, termVectorsNL);
+ rb.rsp.add(TERM_VECTORS, termVectorsNL);
}
}
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java Mon Dec 21 11:39:57 2015
@@ -36,8 +36,6 @@ import java.util.List;
import java.util.HashMap;
import java.util.Iterator;
import java.io.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
abstract class CSVLoaderBase extends ContentStreamLoader {
public static final String SEPARATOR="separator";
@@ -59,8 +57,6 @@ abstract class CSVLoaderBase extends Con
private static Pattern colonSplit = Pattern.compile(":");
private static Pattern commaSplit = Pattern.compile(",");
- public static Logger log = LoggerFactory.getLogger(CSVLoaderBase.class);
-
final SolrParams params;
final CSVStrategy strategy;
final UpdateRequestProcessor processor;
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java Mon Dec 21 11:39:57 2015
@@ -31,8 +31,6 @@ import org.apache.solr.response.SolrQuer
import org.apache.solr.update.AddUpdateCommand;
import org.apache.solr.update.DeleteUpdateCommand;
import org.apache.solr.update.processor.UpdateRequestProcessor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.EOFException;
import java.io.IOException;
@@ -48,7 +46,6 @@ import java.util.Set;
* @see org.apache.solr.common.util.JavaBinCodec
*/
public class JavabinLoader extends ContentStreamLoader {
- public static Logger log = LoggerFactory.getLogger(JavabinLoader.class);
@Override
public void load(SolrQueryRequest req, SolrQueryResponse rsp, ContentStream stream, UpdateRequestProcessor processor) throws Exception {
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java Mon Dec 21 11:39:57 2015
@@ -19,6 +19,7 @@ package org.apache.solr.handler.loader;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -62,7 +63,7 @@ import static org.apache.solr.common.par
* @since solr 4.0
*/
public class JsonLoader extends ContentStreamLoader {
- final static Logger log = LoggerFactory.getLogger(JsonLoader.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String CHILD_DOC_KEY = "_childDocuments_";
@Override
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java Mon Dec 21 11:39:57 2015
@@ -30,6 +30,7 @@ import javax.xml.transform.sax.SAXSource
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -59,7 +60,7 @@ import org.apache.solr.update.CommitUpda
import org.apache.solr.update.DeleteUpdateCommand;
import org.apache.solr.update.RollbackUpdateCommand;
import org.apache.solr.update.processor.UpdateRequestProcessor;
-import org.apache.solr.util.EmptyEntityResolver;
+import org.apache.solr.common.EmptyEntityResolver;
import org.apache.solr.util.xslt.TransformerProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,7 +71,7 @@ import static org.apache.solr.common.par
public class XMLLoader extends ContentStreamLoader {
- public static Logger log = LoggerFactory.getLogger(XMLLoader.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
static final XMLErrorLogger xmllog = new XMLErrorLogger(log);
public static final String CONTEXT_TRANSFORMER_KEY = "xsltupdater.transformer";
@@ -163,11 +164,11 @@ public class XMLLoader extends ContentSt
else {
try {
is = stream.getStream();
- if (UpdateRequestHandler.log.isTraceEnabled()) {
+ if (log.isTraceEnabled()) {
final byte[] body = IOUtils.toByteArray(is);
// TODO: The charset may be wrong, as the real charset is later
// determined by the XML parser, the content-type is only used as a hint!
- UpdateRequestHandler.log.trace("body", new String(body, (charset == null) ?
+ log.trace("body", new String(body, (charset == null) ?
ContentStreamBase.DEFAULT_CHARSET : charset));
IOUtils.closeQuietly(is);
is = new ByteArrayInputStream(body);
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java Mon Dec 21 11:39:57 2015
@@ -17,6 +17,7 @@
package org.apache.solr.highlight;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -82,7 +83,7 @@ import org.slf4j.LoggerFactory;
public class DefaultSolrHighlighter extends SolrHighlighter implements PluginInfoInitialized
{
- public static Logger log = LoggerFactory.getLogger(DefaultSolrHighlighter.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected final SolrCore solrCore;
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java Mon Dec 21 11:39:57 2015
@@ -23,8 +23,6 @@ import org.apache.solr.common.util.Named
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.search.DocList;
import org.apache.solr.util.SolrPluginUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.ArrayList;
@@ -35,7 +33,6 @@ public abstract class SolrHighlighter
{
public static int DEFAULT_PHRASE_LIMIT = 5000;
- public static Logger log = LoggerFactory.getLogger(SolrHighlighter.class);
/**
* Check whether Highlighting is enabled for this request.
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/logging/LogWatcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/logging/LogWatcher.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/logging/LogWatcher.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/logging/LogWatcher.java Mon Dec 21 11:39:57 2015
@@ -26,6 +26,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.impl.StaticLoggerBinder;
+import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -38,7 +39,7 @@ import java.util.concurrent.atomic.Atomi
*/
public abstract class LogWatcher<E> {
- private static final Logger log = LoggerFactory.getLogger(LogWatcher.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected CircularList<E> history;
protected long last = -1;
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/request/IntervalFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/request/IntervalFacets.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/request/IntervalFacets.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/request/IntervalFacets.java Mon Dec 21 11:39:57 2015
@@ -9,7 +9,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Locale;
-import org.apache.lucene.document.FieldType.NumericType;
+import org.apache.lucene.document.FieldType.LegacyNumericType;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.NumericDocValues;
@@ -19,7 +19,7 @@ import org.apache.lucene.search.DocIdSet
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.NumericUtils;
+import org.apache.lucene.util.LegacyNumericUtils;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.SolrParams;
@@ -174,7 +174,7 @@ public class IntervalFacets implements I
private void getCountNumeric() throws IOException {
final FieldType ft = schemaField.getType();
final String fieldName = schemaField.getName();
- final NumericType numericType = ft.getNumericType();
+ final LegacyNumericType numericType = ft.getNumericType();
if (numericType == null) {
throw new IllegalStateException();
}
@@ -555,10 +555,10 @@ public class IntervalFacets implements I
startLimit = ((Integer) schemaField.getType().toObject(schemaField, start)).longValue();
break;
case FLOAT:
- startLimit = NumericUtils.floatToSortableInt((float) schemaField.getType().toObject(schemaField, start));
+ startLimit = LegacyNumericUtils.floatToSortableInt((float) schemaField.getType().toObject(schemaField, start));
break;
case DOUBLE:
- startLimit = NumericUtils.doubleToSortableLong((double) schemaField.getType().toObject(schemaField, start));
+ startLimit = LegacyNumericUtils.doubleToSortableLong((double) schemaField.getType().toObject(schemaField, start));
break;
default:
throw new AssertionError();
@@ -584,10 +584,10 @@ public class IntervalFacets implements I
endLimit = ((Integer) schemaField.getType().toObject(schemaField, end)).longValue();
break;
case FLOAT:
- endLimit = NumericUtils.floatToSortableInt((float) schemaField.getType().toObject(schemaField, end));
+ endLimit = LegacyNumericUtils.floatToSortableInt((float) schemaField.getType().toObject(schemaField, end));
break;
case DOUBLE:
- endLimit = NumericUtils.doubleToSortableLong((double) schemaField.getType().toObject(schemaField, end));
+ endLimit = LegacyNumericUtils.doubleToSortableLong((double) schemaField.getType().toObject(schemaField, end));
break;
default:
throw new AssertionError();
@@ -754,8 +754,8 @@ public class IntervalFacets implements I
* <li>{@link IntervalCompareResult#GREATER_THAN_END} if the value is greater than {@code endLimit}
* <li>{@link IntervalCompareResult#LOWER_THAN_START} if the value is lower than {@code startLimit}
* </ul>
- * @see NumericUtils#floatToSortableInt(float)
- * @see NumericUtils#doubleToSortableLong(double)
+ * @see org.apache.lucene.util.LegacyNumericUtils#floatToSortableInt(float)
+ * @see org.apache.lucene.util.LegacyNumericUtils#doubleToSortableLong(double)
*/
public IntervalCompareResult includes(long value) {
if (startLimit > value) {
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/request/NumericFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/request/NumericFacets.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/request/NumericFacets.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/request/NumericFacets.java Mon Dec 21 11:39:57 2015
@@ -28,7 +28,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.lucene.document.FieldType.NumericType;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.NumericDocValues;
@@ -134,7 +133,7 @@ final class NumericFacets {
mincount = Math.max(mincount, 1);
final SchemaField sf = searcher.getSchema().getField(fieldName);
final FieldType ft = sf.getType();
- final NumericType numericType = ft.getNumericType();
+ final org.apache.lucene.document.FieldType.LegacyNumericType numericType = ft.getNumericType();
if (numericType == null) {
throw new IllegalStateException();
}
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/request/SimpleFacets.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/request/SimpleFacets.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/request/SimpleFacets.java Mon Dec 21 11:39:57 2015
@@ -73,8 +73,6 @@ import org.apache.solr.search.SyntaxErro
import org.apache.solr.search.grouping.GroupingSpecification;
import org.apache.solr.util.BoundedTreeSet;
import org.apache.solr.util.DefaultSolrThreadFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.ArrayList;
@@ -101,8 +99,6 @@ import java.util.concurrent.TimeUnit;
*/
public class SimpleFacets {
- private final static Logger log = LoggerFactory.getLogger(SimpleFacets.class);
-
/** The main set of documents all facet counts should be relative to */
protected DocSet docsOrig;
/** Configuration params behavior should be driven by */
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java Mon Dec 21 11:39:57 2015
@@ -18,6 +18,7 @@
package org.apache.solr.request;
import java.io.Closeable;
+import java.lang.invoke.MethodHandles;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
@@ -31,6 +32,8 @@ import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.component.ResponseBuilder;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.util.TimeZoneUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SolrRequestInfo {
@@ -43,6 +46,7 @@ public class SolrRequestInfo {
protected ResponseBuilder rb;
protected List<Closeable> closeHooks;
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static SolrRequestInfo getRequestInfo() {
return threadLocal.get();
@@ -52,8 +56,8 @@ public class SolrRequestInfo {
// TODO: temporary sanity check... this can be changed to just an assert in the future
SolrRequestInfo prev = threadLocal.get();
if (prev != null) {
- SolrCore.log.error("Previous SolrRequestInfo was not closed! req=" + prev.req.getOriginalParams().toString());
- SolrCore.log.error("prev == info : {}", prev.req == info.req);
+ log.error("Previous SolrRequestInfo was not closed! req=" + prev.req.getOriginalParams().toString());
+ log.error("prev == info : {}", prev.req == info.req);
}
assert prev == null;
@@ -68,7 +72,7 @@ public class SolrRequestInfo {
try {
hook.close();
} catch (Exception e) {
- SolrException.log(SolrCore.log, "Exception during close hook", e);
+ SolrException.log(log, "Exception during close hook", e);
}
}
}
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/request/macro/MacroExpander.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/request/macro/MacroExpander.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/request/macro/MacroExpander.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/request/macro/MacroExpander.java Mon Dec 21 11:39:57 2015
@@ -18,7 +18,7 @@ package org.apache.solr.request.macro;
*/
import org.apache.solr.common.SolrException;
-import org.apache.solr.search.QueryParsing;
+import org.apache.solr.search.StrParser;
import org.apache.solr.search.SyntaxError;
import java.util.ArrayList;
@@ -148,7 +148,7 @@ public class MacroExpander {
start = rbrace + 1;
// String inbetween = val.substring(idx, rbrace);
- QueryParsing.StrParser parser = new QueryParsing.StrParser(val, idx, rbrace);
+ StrParser parser = new StrParser(val, idx, rbrace);
try {
String paramName = parser.getId();
String defVal = null;
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java Mon Dec 21 11:39:57 2015
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -43,7 +44,7 @@ import org.slf4j.LoggerFactory;
public class BinaryResponseWriter implements BinaryQueryResponseWriter {
- private static final Logger LOG = LoggerFactory.getLogger(BinaryResponseWriter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void write(OutputStream out, SolrQueryRequest req, SolrQueryResponse response) throws IOException {
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java Mon Dec 21 11:39:57 2015
@@ -18,6 +18,7 @@ package org.apache.solr.response;
import java.io.IOException;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -42,7 +43,7 @@ import static org.apache.solr.common.par
* @lucene.internal
*/
public class SchemaXmlWriter extends TextResponseWriter {
- private static final Logger log = LoggerFactory.getLogger(SchemaXmlWriter.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final char[] XML_DECLARATION = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>".toCharArray();
private static final char[] MANAGED_SCHEMA_DO_NOT_EDIT_WARNING
= "<!-- Solr managed schema - automatically generated - DO NOT EDIT -->".toCharArray();
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/SolrQueryResponse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/SolrQueryResponse.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/SolrQueryResponse.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/SolrQueryResponse.java Mon Dec 21 11:39:57 2015
@@ -67,6 +67,8 @@ import org.apache.solr.search.SolrReturn
*/
public class SolrQueryResponse {
public static final String NAME = "response";
+ private static final String RESPONSE_HEADER_KEY = "responseHeader";
+ private static final String RESPONSE_KEY = "response";
/**
* Container for user defined values
@@ -171,12 +173,32 @@ public class SolrQueryResponse {
return err;
}
+ /** Set response header */
+ public void addResponseHeader(NamedList<Object> header) {
+ values.add(RESPONSE_HEADER_KEY, header);
+ }
+
+ /** Clear response header */
+ public void removeResponseHeader() {
+ values.remove(RESPONSE_HEADER_KEY);
+ }
+
/** Response header to be logged */
public NamedList<Object> getResponseHeader() {
@SuppressWarnings("unchecked")
- SimpleOrderedMap<Object> header = (SimpleOrderedMap<Object>) values.get("responseHeader");
+ SimpleOrderedMap<Object> header = (SimpleOrderedMap<Object>) values.get(RESPONSE_HEADER_KEY);
return header;
}
+
+ /** Set response */
+ public void addResponse(Object response) {
+ values.add(RESPONSE_KEY, response);
+ }
+
+ /** Return response */
+ public Object getResponse() {
+ return values.get(RESPONSE_KEY);
+ }
/** Add a value to be logged.
*
@@ -199,12 +221,15 @@ public class SolrQueryResponse {
public String getToLogAsString(String logid) {
StringBuilder sb = new StringBuilder(logid);
for (int i=0; i<toLog.size(); i++) {
+ if (sb.length() > 0) {
+ sb.append(' ');
+ }
String name = toLog.getName(i);
Object val = toLog.getVal(i);
if (name != null) {
sb.append(name).append('=');
}
- sb.append(val).append(' ');
+ sb.append(val);
}
return sb.toString();
}
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/SortingResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/SortingResponseWriter.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/SortingResponseWriter.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/SortingResponseWriter.java Mon Dec 21 11:39:57 2015
@@ -20,6 +20,7 @@ package org.apache.solr.response;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.util.List;
import org.apache.lucene.index.LeafReader;
@@ -59,7 +60,7 @@ import org.slf4j.LoggerFactory;
public class SortingResponseWriter implements QueryResponseWriter {
- private final static Logger logger = LoggerFactory.getLogger(SortingResponseWriter.class);
+ private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public void init(NamedList args) {
/* NOOP */
@@ -93,7 +94,7 @@ public class SortingResponseWriter imple
exception = new IOException(new SyntaxError("No sort criteria was provided."));
}
- if(sort.needsScores()) {
+ if(sort != null && sort.needsScores()) {
exception = new IOException(new SyntaxError("Scoring is not currently supported with xsort."));
}
@@ -108,16 +109,18 @@ public class SortingResponseWriter imple
SolrParams params = req.getParams();
String fl = params.get("fl");
+ String[] fields = null;
+
if(fl == null) {
exception = new IOException(new SyntaxError("export field list (fl) must be specified."));
- }
-
- String[] fields = fl.split(",");
+ } else {
+ fields = fl.split(",");
- for(int i=0;i<fields.length; i++) {
- if(fl.trim().equals("score")) {
- exception = new IOException(new SyntaxError("Scoring is not currently supported with xsort."));
- break;
+ for(int i=0;i<fields.length; i++) {
+ if(fl.trim().equals("score")) {
+ exception = new IOException(new SyntaxError("Scoring is not currently supported with xsort."));
+ break;
+ }
}
}
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java Mon Dec 21 11:39:57 2015
@@ -19,25 +19,30 @@ package org.apache.solr.response;
import java.io.IOException;
import java.io.Writer;
-import java.util.*;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.Map;
-import org.apache.solr.client.solrj.io.stream.TupleStream;
-import org.apache.solr.client.solrj.io.Tuple;
import org.apache.lucene.index.StorableField;
import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.util.BytesRef;
+import org.apache.solr.client.solrj.io.Tuple;
+import org.apache.solr.client.solrj.io.stream.TupleStream;
import org.apache.solr.common.EnumFieldValue;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.util.Base64;
-import org.apache.solr.util.DateFormatUtil;
-import org.apache.solr.util.FastWriter;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.DocList;
import org.apache.solr.search.ReturnFields;
+import org.apache.solr.util.DateFormatUtil;
+import org.apache.solr.util.FastWriter;
/** Base class for text-oriented response writers.
*
@@ -162,6 +167,8 @@ public abstract class TextResponseWriter
writeNamedList(name, (NamedList)val);
} else if (val instanceof TupleStream) {
writeTupleStream((TupleStream) val);
+ } else if (val instanceof Path) {
+ writeStr(name, ((Path) val).toAbsolutePath().toString(), true);
} else if (val instanceof Iterable) {
writeArray(name,((Iterable)val).iterator());
} else if (val instanceof Object[]) {
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/XSLTResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/XSLTResponseWriter.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/XSLTResponseWriter.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/XSLTResponseWriter.java Mon Dec 21 11:39:57 2015
@@ -23,6 +23,7 @@ import java.io.CharArrayWriter;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
+import java.lang.invoke.MethodHandles;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,7 +54,7 @@ public class XSLTResponseWriter implemen
public static final int XSLT_CACHE_DEFAULT = 60;
private static final String XSLT_CACHE_PARAM = "xsltCacheLifetimeSeconds";
- private static final Logger log = LoggerFactory.getLogger(XSLTResponseWriter.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final XMLErrorLogger xmllog = new XMLErrorLogger(log);
@Override
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/transform/DocTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/transform/DocTransformer.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/transform/DocTransformer.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/transform/DocTransformer.java Mon Dec 21 11:39:57 2015
@@ -63,9 +63,9 @@ public abstract class DocTransformer {
public abstract void transform(SolrDocument doc, int docid, float score) throws IOException;
/**
- * When a transformer needs access to fields that are not automaticaly derived from the
+ * When a transformer needs access to fields that are not automatically derived from the
* input fields names, this option lets us explicitly say the field names that we hope
- * will be in the SolrDocument. These fields will be requestd from the
+ * will be in the SolrDocument. These fields will be requested from the
* {@link SolrIndexSearcher} but may or may not be returned in the final
* {@link QueryResponseWriter}
*
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/transform/ElevatedMarkerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/transform/ElevatedMarkerFactory.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/transform/ElevatedMarkerFactory.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/transform/ElevatedMarkerFactory.java Mon Dec 21 11:39:57 2015
@@ -19,9 +19,8 @@ package org.apache.solr.response.transfo
import java.util.Set;
-import org.apache.lucene.document.Field;
-import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.params.SolrParams;
+import org.apache.solr.handler.component.QueryElevationComponent;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.SchemaField;
@@ -48,7 +47,7 @@ class MarkTransformer extends BaseEditor
@Override
protected Set<String> getIdSet() {
- return (Set<String>) context.getRequest().getContext().get("BOOSTED");
+ return (Set<String>) context.getRequest().getContext().get(QueryElevationComponent.BOOSTED);
}
}
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/transform/RawValueTransformerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/transform/RawValueTransformerFactory.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/transform/RawValueTransformerFactory.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/response/transform/RawValueTransformerFactory.java Mon Dec 21 11:39:57 2015
@@ -124,6 +124,11 @@ public class RawValueTransformerFactory
doc.setField(display, new WriteableStringValue(val));
}
}
+
+ @Override
+ public String[] getExtraRequestFields() {
+ return new String[] {this.field};
+ }
}
public static class WriteableStringValue extends WriteableValue {
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/ManagedResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/ManagedResource.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/ManagedResource.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/ManagedResource.java Mon Dec 21 11:39:57 2015
@@ -18,6 +18,7 @@ package org.apache.solr.rest;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
@@ -42,8 +43,8 @@ import org.slf4j.LoggerFactory;
* needs to be managed using the REST API.
*/
public abstract class ManagedResource {
-
- public static final Logger log = LoggerFactory.getLogger(ManagedResource.class);
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* Marker interface to indicate a ManagedResource implementation class also supports
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/ManagedResourceStorage.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/ManagedResourceStorage.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/ManagedResourceStorage.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/ManagedResourceStorage.java Mon Dec 21 11:39:57 2015
@@ -28,6 +28,7 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Reader;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
@@ -450,7 +451,7 @@ public abstract class ManagedResourceSto
}
} // end JsonStorage
- public static final Logger log = LoggerFactory.getLogger(ManagedResourceStorage.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final Charset UTF_8 = StandardCharsets.UTF_8;
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/RestManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/RestManager.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/RestManager.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/RestManager.java Mon Dec 21 11:39:57 2015
@@ -18,6 +18,7 @@ package org.apache.solr.rest;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.Collection;
@@ -58,7 +59,7 @@ import org.slf4j.LoggerFactory;
*/
public class RestManager {
- public static final Logger log = LoggerFactory.getLogger(RestManager.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String SCHEMA_BASE_PATH = "/schema";
public static final String MANAGED_ENDPOINT = "/managed";
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/SolrSchemaRestApi.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/SolrSchemaRestApi.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/SolrSchemaRestApi.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/SolrSchemaRestApi.java Mon Dec 21 11:39:57 2015
@@ -31,6 +31,7 @@ import org.restlet.routing.Router;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.Collections;
import java.util.HashSet;
import java.util.Locale;
@@ -40,7 +41,7 @@ import java.util.Set;
* Restlet servlet handling /<context>/<collection>/schema/* URL paths
*/
public class SolrSchemaRestApi extends Application {
- public static final Logger log = LoggerFactory.getLogger(SolrSchemaRestApi.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String FIELDS_PATH = "/" + IndexSchema.FIELDS;
public static final String DYNAMIC_FIELDS = IndexSchema.DYNAMIC_FIELDS.toLowerCase(Locale.ROOT);
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/CopyFieldCollectionResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/CopyFieldCollectionResource.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/CopyFieldCollectionResource.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/CopyFieldCollectionResource.java Mon Dec 21 11:39:57 2015
@@ -30,6 +30,7 @@ import org.restlet.resource.ResourceExce
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -59,7 +60,7 @@ import static org.apache.solr.common.Sol
* in dest.fl and also match any of the sources in source.fl.
*/
public class CopyFieldCollectionResource extends BaseFieldResource implements GETable, POSTable {
- private static final Logger log = LoggerFactory.getLogger(CopyFieldCollectionResource.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String SOURCE_FIELD_LIST = IndexSchema.SOURCE + "." + CommonParams.FL;
private static final String DESTINATION_FIELD_LIST = IndexSchema.DESTINATION + "." + CommonParams.FL;
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldCollectionResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldCollectionResource.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldCollectionResource.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldCollectionResource.java Mon Dec 21 11:39:57 2015
@@ -32,6 +32,7 @@ import org.restlet.resource.ResourceExce
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -47,7 +48,7 @@ import java.util.Map;
* parameter.
*/
public class DynamicFieldCollectionResource extends BaseFieldResource implements GETable, POSTable {
- private static final Logger log = LoggerFactory.getLogger(DynamicFieldCollectionResource.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public DynamicFieldCollectionResource() {
super();
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldResource.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldResource.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldResource.java Mon Dec 21 11:39:57 2015
@@ -32,6 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -46,7 +47,7 @@ import static java.util.Collections.sing
* where pattern is a field name pattern (with an asterisk at the beginning or the end).
*/
public class DynamicFieldResource extends BaseFieldResource implements GETable, PUTable {
- private static final Logger log = LoggerFactory.getLogger(DynamicFieldResource.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String fieldNamePattern;
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/FieldCollectionResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/FieldCollectionResource.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/FieldCollectionResource.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/FieldCollectionResource.java Mon Dec 21 11:39:57 2015
@@ -35,6 +35,7 @@ import org.restlet.resource.ResourceExce
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -64,7 +65,7 @@ import java.util.TreeSet;
* </ul>
*/
public class FieldCollectionResource extends BaseFieldResource implements GETable, POSTable {
- private static final Logger log = LoggerFactory.getLogger(FieldCollectionResource.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private boolean includeDynamic;
public FieldCollectionResource() {
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/FieldResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/FieldResource.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/FieldResource.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/FieldResource.java Mon Dec 21 11:39:57 2015
@@ -34,6 +34,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -52,7 +53,7 @@ import java.util.Map;
* The PUT method accepts field addition requests in JSON format.
*/
public class FieldResource extends BaseFieldResource implements GETable, PUTable {
- private static final Logger log = LoggerFactory.getLogger(FieldResource.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private boolean includeDynamic;
private String fieldName;
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeCollectionResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeCollectionResource.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeCollectionResource.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeCollectionResource.java Mon Dec 21 11:39:57 2015
@@ -32,6 +32,7 @@ import org.restlet.resource.ResourceExce
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -45,7 +46,7 @@ import java.util.TreeMap;
* The GET method returns properties for all field types defined in the schema.
*/
public class FieldTypeCollectionResource extends BaseFieldTypeResource implements GETable, POSTable {
- private static final Logger log = LoggerFactory.getLogger(FieldTypeCollectionResource.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private Map<String,List<String>> fieldsByFieldType;
private Map<String,List<String>> dynamicFieldsByFieldType;
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeResource.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeResource.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeResource.java Mon Dec 21 11:39:57 2015
@@ -32,6 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.UnsupportedEncodingException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -44,7 +45,7 @@ import java.util.Map;
* The GET method returns properties for the named field type.
*/
public class FieldTypeResource extends BaseFieldTypeResource implements GETable, PUTable {
- private static final Logger log = LoggerFactory.getLogger(FieldTypeResource.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private String typeName;
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedStopFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedStopFilterFactory.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedStopFilterFactory.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedStopFilterFactory.java Mon Dec 21 11:39:57 2015
@@ -25,8 +25,6 @@ import org.apache.lucene.analysis.util.C
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.rest.ManagedResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* TokenFilterFactory that uses the ManagedWordSetResource implementation
@@ -34,8 +32,6 @@ import org.slf4j.LoggerFactory;
*/
public class ManagedStopFilterFactory extends BaseManagedTokenFilterFactory {
- public static final Logger log = LoggerFactory.getLogger(ManagedStopFilterFactory.class);
-
// this only gets changed once during core initialization and not every
// time an update is made to the underlying managed word set.
private CharArraySet stopWords = null;
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java Mon Dec 21 11:39:57 2015
@@ -18,6 +18,7 @@ package org.apache.solr.rest.schema.anal
import java.io.IOException;
import java.io.Reader;
+import java.lang.invoke.MethodHandles;
import java.text.ParseException;
import java.util.HashMap;
import java.util.List;
@@ -52,7 +53,7 @@ import org.slf4j.LoggerFactory;
*/
public class ManagedSynonymFilterFactory extends BaseManagedTokenFilterFactory {
- public static final Logger log = LoggerFactory.getLogger(ManagedSynonymFilterFactory.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String SYNONYM_MAPPINGS = "synonymMappings";
public static final String IGNORE_CASE_INIT_ARG = "ignoreCase";
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedWordSetResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedWordSetResource.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedWordSetResource.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedWordSetResource.java Mon Dec 21 11:39:57 2015
@@ -16,6 +16,7 @@ package org.apache.solr.rest.schema.anal
* limitations under the License.
*/
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -33,6 +34,8 @@ import org.apache.solr.response.SolrQuer
import org.apache.solr.rest.BaseSolrResource;
import org.apache.solr.rest.ManagedResource;
import org.apache.solr.rest.ManagedResourceStorage.StorageIO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* ManagedResource implementation for managing a set of words using the REST API;
@@ -45,7 +48,9 @@ public class ManagedWordSetResource exte
public static final String WORD_SET_JSON_FIELD = "wordSet";
public static final String IGNORE_CASE_INIT_ARG = "ignoreCase";
- private SortedSet<String> managedWords = null;
+ private SortedSet<String> managedWords = null;
+
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public ManagedWordSetResource(String resourceId, SolrResourceLoader loader, StorageIO storageIO)
throws SolrException {
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java Mon Dec 21 11:39:57 2015
@@ -18,6 +18,7 @@ package org.apache.solr.schema;
*/
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -82,7 +83,7 @@ public abstract class AbstractSpatialFie
public static final String RECIP_DISTANCE = "recipDistance";
public static final String NONE = "none";
- protected final Logger log = LoggerFactory.getLogger( getClass() );
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected SpatialContext ctx;
protected SpatialArgsParser argsParser;
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/AbstractSpatialPrefixTreeFieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/AbstractSpatialPrefixTreeFieldType.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/AbstractSpatialPrefixTreeFieldType.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/AbstractSpatialPrefixTreeFieldType.java Mon Dec 21 11:39:57 2015
@@ -19,6 +19,7 @@ package org.apache.solr.schema;
import java.io.IOException;
import java.io.Reader;
+import java.lang.invoke.MethodHandles;
import java.util.Map;
import org.apache.commons.io.IOUtils;
@@ -32,6 +33,8 @@ import org.apache.lucene.spatial.query.S
import org.apache.solr.util.MapListener;
import com.spatial4j.core.shape.Shape;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @see PrefixTreeStrategy
@@ -46,6 +49,8 @@ public abstract class AbstractSpatialPre
private Double distErrPct;
private Integer defaultFieldValuesArrayLen;
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@Override
protected void init(IndexSchema schema, Map<String, String> args) {
super.init(schema, args);
@@ -85,9 +90,13 @@ public abstract class AbstractSpatialPre
return new TokenStreamComponents(new KeywordTokenizer()) {
private Shape shape = null;
- protected void setReader(final Reader reader) throws IOException {
+ protected void setReader(final Reader reader) {
source.setReader(reader);
- shape = parseShape(IOUtils.toString(reader));
+ try {
+ shape = parseShape(IOUtils.toString(reader));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
}
public TokenStream getTokenStream() {
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/BinaryField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/BinaryField.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/BinaryField.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/BinaryField.java Mon Dec 21 11:39:57 2015
@@ -18,6 +18,7 @@
package org.apache.solr.schema;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.nio.ByteBuffer;
import org.apache.lucene.document.Field;
@@ -27,10 +28,14 @@ import org.apache.lucene.uninverting.Uni
import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.util.Base64;
import org.apache.solr.response.TextResponseWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class BinaryField extends FieldType {
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
private String toBase64String(ByteBuffer buf) {
return Base64.byteArrayToBase64(buf.array(), buf.position(), buf.limit()-buf.position());
}
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/BoolField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/BoolField.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/BoolField.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/BoolField.java Mon Dec 21 11:39:57 2015
@@ -62,7 +62,7 @@ public class BoolField extends Primitive
@Override
public ValueSource getValueSource(SchemaField field, QParser qparser) {
- field.checkFieldCacheSource(qparser);
+ field.checkFieldCacheSource();
return new BoolFieldSource(field.name);
}
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/ClassicIndexSchemaFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/ClassicIndexSchemaFactory.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/ClassicIndexSchemaFactory.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/ClassicIndexSchemaFactory.java Mon Dec 21 11:39:57 2015
@@ -16,6 +16,8 @@ package org.apache.solr.schema;
* limitations under the License.
*/
+import java.lang.invoke.MethodHandles;
+
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.util.NamedList;
@@ -23,7 +25,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ClassicIndexSchemaFactory extends IndexSchemaFactory {
- private static final Logger log = LoggerFactory.getLogger(ClassicIndexSchemaFactory.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void init(NamedList args) {
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/CurrencyField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/CurrencyField.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/CurrencyField.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/CurrencyField.java Mon Dec 21 11:39:57 2015
@@ -18,6 +18,7 @@ package org.apache.solr.schema;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Currency;
import java.util.HashMap;
@@ -82,7 +83,7 @@ public class CurrencyField extends Field
private String exchangeRateProviderClass;
private String defaultCurrency;
private ExchangeRateProvider provider;
- public static Logger log = LoggerFactory.getLogger(CurrencyField.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* A wrapper arround <code>Currency.getInstance</code> that returns null
@@ -274,7 +275,7 @@ public class CurrencyField extends Field
*/
public RawCurrencyValueSource getValueSource(SchemaField field,
QParser parser) {
- field.checkFieldCacheSource(parser);
+ field.checkFieldCacheSource();
return new RawCurrencyValueSource(field, defaultCurrency, parser);
}
@@ -670,7 +671,7 @@ public class CurrencyField extends Field
* Configuration for currency. Provides currency exchange rates.
*/
class FileExchangeRateProvider implements ExchangeRateProvider {
- public static Logger log = LoggerFactory.getLogger(FileExchangeRateProvider.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected static final String PARAM_CURRENCY_CONFIG = "currencyConfig";
// Exchange rate map, maps Currency Code -> Currency Code -> Rate
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/EnumField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/EnumField.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/EnumField.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/EnumField.java Mon Dec 21 11:39:57 2015
@@ -25,6 +25,7 @@ import javax.xml.xpath.XPathExpressionEx
import javax.xml.xpath.XPathFactory;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -33,6 +34,7 @@ import java.util.Locale;
import java.util.Map;
import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.LegacyIntField;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.document.SortedSetDocValuesField;
import org.apache.lucene.index.IndexOptions;
@@ -41,7 +43,7 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.queries.function.valuesource.EnumFieldSource;
import org.apache.lucene.search.ConstantScoreQuery;
import org.apache.lucene.search.DocValuesRangeQuery;
-import org.apache.lucene.search.NumericRangeQuery;
+import org.apache.lucene.search.LegacyNumericRangeQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SortField;
import org.apache.lucene.uninverting.UninvertingReader.Type;
@@ -49,7 +51,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.BytesRefBuilder;
import org.apache.lucene.util.CharsRef;
import org.apache.lucene.util.CharsRefBuilder;
-import org.apache.lucene.util.NumericUtils;
+import org.apache.lucene.util.LegacyNumericUtils;
import org.apache.solr.common.EnumFieldValue;
import org.apache.solr.common.SolrException;
import org.apache.solr.response.TextResponseWriter;
@@ -66,7 +68,7 @@ import org.xml.sax.SAXException;
*/
public class EnumField extends PrimitiveFieldType {
- public static final Logger log = LoggerFactory.getLogger(EnumField.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected static final Locale LOCALE = Locale.getDefault();
protected static final String PARAM_ENUMS_CONFIG = "enumsConfig";
protected static final String PARAM_ENUM_NAME = "enumName";
@@ -203,7 +205,7 @@ public class EnumField extends Primitive
*/
@Override
public ValueSource getValueSource(SchemaField field, QParser qparser) {
- field.checkFieldCacheSource(qparser);
+ field.checkFieldCacheSource();
return new EnumFieldSource(field.getName(), enumIntToStringMap, enumStringToIntMap);
}
@@ -234,8 +236,8 @@ public class EnumField extends Primitive
* {@inheritDoc}
*/
@Override
- public FieldType.NumericType getNumericType() {
- return FieldType.NumericType.INT;
+ public FieldType.LegacyNumericType getNumericType() {
+ return FieldType.LegacyNumericType.INT;
}
/**
@@ -258,10 +260,10 @@ public class EnumField extends Primitive
max == null ? null : maxValue.longValue(),
minInclusive, maxInclusive));
} else {
- query = NumericRangeQuery.newIntRange(field.getName(), DEFAULT_PRECISION_STEP,
- min == null ? null : minValue,
- max == null ? null : maxValue,
- minInclusive, maxInclusive);
+ query = LegacyNumericRangeQuery.newIntRange(field.getName(), DEFAULT_PRECISION_STEP,
+ min == null ? null : minValue,
+ max == null ? null : maxValue,
+ minInclusive, maxInclusive);
}
return query;
@@ -297,7 +299,7 @@ public class EnumField extends Primitive
return;
final Integer intValue = stringValueToIntValue(s);
- NumericUtils.intToPrefixCoded(intValue, 0, result);
+ LegacyNumericUtils.intToPrefixCoded(intValue, 0, result);
}
/**
@@ -328,7 +330,7 @@ public class EnumField extends Primitive
if (indexedForm == null)
return null;
final BytesRef bytesRef = new BytesRef(indexedForm);
- final Integer intValue = NumericUtils.prefixCodedToInt(bytesRef);
+ final Integer intValue = LegacyNumericUtils.prefixCodedToInt(bytesRef);
return intValueToStringValue(intValue);
}
@@ -337,7 +339,7 @@ public class EnumField extends Primitive
*/
@Override
public CharsRef indexedToReadable(BytesRef input, CharsRefBuilder output) {
- final Integer intValue = NumericUtils.prefixCodedToInt(input);
+ final Integer intValue = LegacyNumericUtils.prefixCodedToInt(input);
final String stringValue = intValueToStringValue(intValue);
output.grow(stringValue.length());
output.setLength(stringValue.length());
@@ -350,7 +352,7 @@ public class EnumField extends Primitive
*/
@Override
public EnumFieldValue toObject(SchemaField sf, BytesRef term) {
- final Integer intValue = NumericUtils.prefixCodedToInt(term);
+ final Integer intValue = LegacyNumericUtils.prefixCodedToInt(term);
final String stringValue = intValueToStringValue(intValue);
return new EnumFieldValue(intValue, stringValue);
}
@@ -364,7 +366,7 @@ public class EnumField extends Primitive
if (val == null)
return null;
final BytesRefBuilder bytes = new BytesRefBuilder();
- NumericUtils.intToPrefixCoded(val.intValue(), 0, bytes);
+ LegacyNumericUtils.intToPrefixCoded(val.intValue(), 0, bytes);
return bytes.get().utf8ToString();
}
@@ -397,11 +399,11 @@ public class EnumField extends Primitive
newType.setStoreTermVectorOffsets(field.storeTermOffsets());
newType.setStoreTermVectorPositions(field.storeTermPositions());
newType.setStoreTermVectorPayloads(field.storeTermPayloads());
- newType.setNumericType(FieldType.NumericType.INT);
+ newType.setNumericType(FieldType.LegacyNumericType.INT);
newType.setNumericPrecisionStep(DEFAULT_PRECISION_STEP);
final org.apache.lucene.document.Field f;
- f = new org.apache.lucene.document.IntField(field.getName(), intValue.intValue(), newType);
+ f = new LegacyIntField(field.getName(), intValue.intValue(), newType);
f.setBoost(boost);
return f;
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java Mon Dec 21 11:39:57 2015
@@ -36,7 +36,7 @@ import java.util.Map;
* <li>It's OK for a keyField value to point to multiple documents (no uniqueness requirement)</li>
* </ul>
* <code>valType</code> is a reference to another fieldType to define the value type of this field
- * (must currently be TrieFloatField or FloatField (valType="pfloat|float|tfloat") if used).
+ * (must currently be TrieFloatField or LegacyFloatField (valType="pfloat|float|tfloat") if used).
* This parameter has never been implemented. As of Solr 3.6/4.0 it is optional and can be omitted.
*
* The format of the external file is simply newline separated keyFieldValue=floatValue.
@@ -99,7 +99,7 @@ public class ExternalFileField extends F
@Override
public ValueSource getValueSource(SchemaField field, QParser parser) {
- return getFileFloatSource(field, parser.getReq().getCore().getDataDir());
+ return getFileFloatSource(field);
}
/**
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/ExternalFileFieldReloader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/ExternalFileFieldReloader.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/ExternalFileFieldReloader.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/ExternalFileFieldReloader.java Mon Dec 21 11:39:57 2015
@@ -26,6 +26,7 @@ import org.apache.solr.search.function.F
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
@@ -53,7 +54,7 @@ public class ExternalFileFieldReloader e
private String datadir;
private List<FileFloatSource> fieldSources = new ArrayList<>();
- private static final Logger log = LoggerFactory.getLogger(ExternalFileFieldReloader.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public ExternalFileFieldReloader(SolrCore core) {
super(core);
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/FieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/FieldType.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/FieldType.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/FieldType.java Mon Dec 21 11:39:57 2015
@@ -18,6 +18,7 @@
package org.apache.solr.schema;
import java.io.IOException;
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -48,7 +49,6 @@ import org.apache.lucene.search.SortFiel
import org.apache.lucene.search.SortedSetSelector;
import org.apache.lucene.search.SortedNumericSelector;
import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.TermRangeQuery;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.uninverting.UninvertingReader;
import org.apache.lucene.util.BytesRef;
@@ -78,7 +78,7 @@ import static org.apache.lucene.analysis
*
*/
public abstract class FieldType extends FieldProperties {
- public static final Logger log = LoggerFactory.getLogger(FieldType.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* The default poly field separator.
@@ -611,7 +611,7 @@ public abstract class FieldType extends
/** Return the numeric type of this field, or null if this field is not a
* numeric field. */
- public org.apache.lucene.document.FieldType.NumericType getNumericType() {
+ public org.apache.lucene.document.FieldType.LegacyNumericType getNumericType() {
return null;
}
@@ -669,7 +669,7 @@ public abstract class FieldType extends
* Lucene FieldCache.)
*/
public ValueSource getValueSource(SchemaField field, QParser parser) {
- field.checkFieldCacheSource(parser);
+ field.checkFieldCacheSource();
return new StrFieldSource(field.name);
}
@@ -745,7 +745,7 @@ public abstract class FieldType extends
// match-only
return getRangeQuery(parser, field, externalVal, externalVal, true, true);
} else {
- return new TermQuery(new Term(field.getName(), br.toBytesRef()));
+ return new TermQuery(new Term(field.getName(), br));
}
}
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java Mon Dec 21 11:39:57 2015
@@ -21,6 +21,8 @@ import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
+
+import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -55,8 +57,7 @@ public final class FieldTypePluginLoader
private static final String LUCENE_MATCH_VERSION_PARAM
= IndexSchema.LUCENE_MATCH_VERSION_PARAM;
- protected final static Logger log
- = LoggerFactory.getLogger(FieldTypePluginLoader.class);
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final XPath xpath = XPathFactory.newInstance().newXPath();
Modified: lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/GeoHashField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/GeoHashField.java?rev=1721134&r1=1721133&r2=1721134&view=diff
==============================================================================
--- lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/GeoHashField.java (original)
+++ lucene/dev/branches/lucene6835/solr/core/src/java/org/apache/solr/schema/GeoHashField.java Mon Dec 21 11:39:57 2015
@@ -89,7 +89,7 @@ public class GeoHashField extends FieldT
@Override
public ValueSource getValueSource(SchemaField field, QParser parser) {
- field.checkFieldCacheSource(parser);
+ field.checkFieldCacheSource();
return new StrFieldSource(field.name);
}