You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/08/25 03:09:40 UTC
[03/15] lucene-solr:jira/http2: SOLR-12690: Regularize LoggerFactory
declarations
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
index 5041841..654b166 100644
--- a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
@@ -131,7 +131,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
public static final String PATH = "/replication";
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
SolrCore core;
private volatile boolean closed = false;
@@ -158,11 +158,11 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
try {
version = Long.parseLong(commitTime);
} catch (NumberFormatException e) {
- LOG.warn("Version in commitData was not formatted correctly: " + commitTime, e);
+ log.warn("Version in commitData was not formatted correctly: " + commitTime, e);
}
}
} catch (IOException e) {
- LOG.warn("Unable to get version from commitData, commit: " + commit, e);
+ log.warn("Unable to get version from commitData, commit: " + commit, e);
}
return new CommitVersionInfo(generation, version);
}
@@ -375,7 +375,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
nl.add(CMD_GET_FILE_LIST, commitList);
l.add(nl);
} catch (IOException e) {
- LOG.warn("Exception while reading files for commit " + c, e);
+ log.warn("Exception while reading files for commit " + c, e);
}
}
return l;
@@ -392,7 +392,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
checksum.update(buffer, 0, bytesRead);
return checksum.getValue();
} catch (Exception e) {
- LOG.warn("Exception in finding checksum of " + f, e);
+ log.warn("Exception in finding checksum of " + f, e);
} finally {
IOUtils.closeQuietly(fis);
}
@@ -406,7 +406,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
if (!indexFetchLock.tryLock())
return IndexFetchResult.LOCK_OBTAIN_FAILED;
if (core.getCoreContainer().isShutDown()) {
- LOG.warn("I was asked to replicate but CoreContainer is shutting down");
+ log.warn("I was asked to replicate but CoreContainer is shutting down");
return IndexFetchResult.CONTAINER_IS_SHUTTING_DOWN;
}
try {
@@ -420,7 +420,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
}
return currentIndexFetcher.fetchLatestIndex(forceReplication);
} catch (Exception e) {
- SolrException.log(LOG, "Index fetch failed ", e);
+ SolrException.log(log, "Index fetch failed ", e);
if (currentIndexFetcher != pollingIndexFetcher) {
currentIndexFetcher.destroy();
}
@@ -568,7 +568,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
snapShooter.validateCreateSnapshot();
snapShooter.createSnapAsync(numberToKeep, (nl) -> snapShootDetails = nl);
} catch (Exception e) {
- LOG.error("Exception during creating a snapshot", e);
+ log.error("Exception during creating a snapshot", e);
rsp.add("exception", e);
}
}
@@ -629,7 +629,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
long checksum = CodecUtil.retrieveChecksum(in);
fileMeta.put(CHECKSUM, checksum);
} catch (Exception e) {
- LOG.warn("Could not read checksum from index file: " + file, e);
+ log.warn("Could not read checksum from index file: " + file, e);
}
}
@@ -647,7 +647,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
try {
fileMeta.put(CHECKSUM, CodecUtil.retrieveChecksum(in));
} catch (Exception e) {
- LOG.warn("Could not read checksum from index file: " + infos.getSegmentsFileName(), e);
+ log.warn("Could not read checksum from index file: " + infos.getSegmentsFileName(), e);
}
}
}
@@ -655,13 +655,13 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
} catch (IOException e) {
rsp.add("status", "unable to get file names for given index generation");
rsp.add(EXCEPTION, e);
- LOG.error("Unable to get file names for indexCommit generation: " + gen, e);
+ log.error("Unable to get file names for indexCommit generation: " + gen, e);
} finally {
if (dir != null) {
try {
core.getDirectoryFactory().release(dir);
} catch (IOException e) {
- SolrException.log(LOG, "Could not release directory after fetching file list", e);
+ SolrException.log(log, "Could not release directory after fetching file list", e);
}
}
}
@@ -670,19 +670,19 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
if (solrParams.getBool(TLOG_FILES, false)) {
try {
List<Map<String, Object>> tlogfiles = getTlogFileList(commit);
- LOG.info("Adding tlog files to list: " + tlogfiles);
+ log.info("Adding tlog files to list: " + tlogfiles);
rsp.add(TLOG_FILES, tlogfiles);
}
catch (IOException e) {
rsp.add("status", "unable to get tlog file names for given index generation");
rsp.add(EXCEPTION, e);
- LOG.error("Unable to get tlog file names for indexCommit generation: " + gen, e);
+ log.error("Unable to get tlog file names for indexCommit generation: " + gen, e);
}
}
if (confFileNameAlias.size() < 1 || core.getCoreContainer().isZooKeeperAware())
return;
- LOG.debug("Adding config files to list: " + includeConfFiles);
+ log.debug("Adding config files to list: " + includeConfFiles);
//if configuration files need to be included get their details
rsp.add(CONF_FILES, getConfFileInfoFromCache(confFileNameAlias, confFileInfoCache));
}
@@ -776,14 +776,14 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
void disablePoll() {
if (isSlave) {
pollDisabled.set(true);
- LOG.info("inside disable poll, value of pollDisabled = " + pollDisabled);
+ log.info("inside disable poll, value of pollDisabled = " + pollDisabled);
}
}
void enablePoll() {
if (isSlave) {
pollDisabled.set(false);
- LOG.info("inside enable poll, value of pollDisabled = " + pollDisabled);
+ log.info("inside enable poll, value of pollDisabled = " + pollDisabled);
}
}
@@ -828,7 +828,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
try {
return core.withSearcher(searcher -> CommitVersionInfo.build(searcher.getIndexReader().getIndexCommit()));
} catch (IOException e) {
- LOG.warn("Unable to get index commit: ", e);
+ log.warn("Unable to get index commit: ", e);
return null;
}
}
@@ -925,7 +925,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
NamedList nl = fetcher.getDetails();
slave.add("masterDetails", nl.get(CMD_DETAILS));
} catch (Exception e) {
- LOG.warn(
+ log.warn(
"Exception while invoking 'details' method for replication on master ",
e);
slave.add(ERR_STATUS, "invalid_master");
@@ -1033,7 +1033,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
slave.add("timeRemaining", String.valueOf(estimatedTimeRemaining) + "s");
slave.add("downloadSpeed", NumberUtils.readableSize(downloadSpeed));
} catch (Exception e) {
- LOG.error("Exception while writing replication details: ", e);
+ log.error("Exception while writing replication details: ", e);
}
}
}
@@ -1141,22 +1141,22 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
pollIntervalStr = intervalStr;
pollIntervalNs = readIntervalNs(pollIntervalStr);
if (pollIntervalNs == null || pollIntervalNs <= 0) {
- LOG.info(" No value set for 'pollInterval'. Timer Task not started.");
+ log.info(" No value set for 'pollInterval'. Timer Task not started.");
return;
}
Runnable task = () -> {
if (pollDisabled.get()) {
- LOG.info("Poll disabled");
+ log.info("Poll disabled");
return;
}
try {
- LOG.debug("Polling for index modifications");
+ log.debug("Polling for index modifications");
markScheduledExecutionStart();
IndexFetchResult fetchResult = doFetch(null, false);
if (pollListener != null) pollListener.onComplete(core, fetchResult);
} catch (Exception e) {
- LOG.error("Exception in fetching index", e);
+ log.error("Exception in fetching index", e);
}
};
executorService = Executors.newSingleThreadScheduledExecutor(
@@ -1165,7 +1165,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
long initialDelayNs = new Random().nextLong() % pollIntervalNs
+ TimeUnit.NANOSECONDS.convert(1, TimeUnit.MILLISECONDS);
executorService.scheduleAtFixedRate(task, initialDelayNs, pollIntervalNs, TimeUnit.NANOSECONDS);
- LOG.info("Poll scheduled at an interval of {}ms",
+ log.info("Poll scheduled at an interval of {}ms",
TimeUnit.MILLISECONDS.convert(pollIntervalNs, TimeUnit.NANOSECONDS));
}
@@ -1193,7 +1193,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
if (enableMaster || (enableSlave && !currentIndexFetcher.fetchFromLeader)) {
if (core.getCoreContainer().getZkController() != null) {
- LOG.warn("SolrCloud is enabled for core " + core.getName() + " but so is old-style replication. Make sure you" +
+ log.warn("SolrCloud is enabled for core " + core.getName() + " but so is old-style replication. Make sure you" +
" intend this behavior, it usually indicates a mis-configuration. Master setting is " +
Boolean.toString(enableMaster) + " and slave setting is " + Boolean.toString(enableSlave));
}
@@ -1214,7 +1214,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
// if there is an alias add it or it is null
confFileNameAlias.add(strs[0], strs.length > 1 ? strs[1] : null);
}
- LOG.info("Replication enabled for following config files: " + includeConfFiles);
+ log.info("Replication enabled for following config files: " + includeConfFiles);
}
List backup = master.getAll("backupAfter");
boolean backupOnCommit = backup.contains("commit");
@@ -1238,7 +1238,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
solrPolicy.setMaxOptimizedCommitsToKeep(1);
}
} else {
- LOG.warn("Replication can't call setMaxOptimizedCommitsToKeep on " + policy);
+ log.warn("Replication can't call setMaxOptimizedCommitsToKeep on " + policy);
}
}
@@ -1282,7 +1282,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
iw.decref();
} catch (IOException e) {
- LOG.warn("Unable to get IndexCommit on startup", e);
+ log.warn("Unable to get IndexCommit on startup", e);
} finally {
if (s!=null) s.decref();
}
@@ -1309,7 +1309,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
}
}
}
- LOG.info("Commits will be reserved for " + reserveCommitDuration + "ms.");
+ log.info("Commits will be reserved for " + reserveCommitDuration + "ms.");
}
// check master or slave is enabled
@@ -1416,7 +1416,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
snapShooter.validateCreateSnapshot();
snapShooter.createSnapAsync(numberToKeep, (nl) -> snapShootDetails = nl);
} catch (Exception e) {
- LOG.error("Exception while snapshooting", e);
+ log.error("Exception while snapshooting", e);
}
}
}
@@ -1560,7 +1560,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
}
fos.write(buf, 0, read);
fos.flush();
- LOG.debug("Wrote {} bytes for file {}", offset + read, fileName);
+ log.debug("Wrote {} bytes for file {}", offset + read, fileName);
//Pause if necessary
maxBytesBeforePause += read;
@@ -1577,7 +1577,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
in.seek(offset);
}
} catch (IOException e) {
- LOG.warn("Exception while writing response for params: " + params, e);
+ log.warn("Exception while writing response for params: " + params, e);
} finally {
if (in != null) {
in.close();
@@ -1645,7 +1645,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
writeNothingAndFlush();
}
} catch (IOException e) {
- LOG.warn("Exception while writing response for params: " + params, e);
+ log.warn("Exception while writing response for params: " + params, e);
} finally {
IOUtils.closeQuietly(inputStream);
extendReserveAndReleaseCommitPoint();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/SnapShooter.java b/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
index b955554..2c3c691 100644
--- a/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
+++ b/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
* @since solr 1.4
*/
public class SnapShooter {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private SolrCore solrCore;
private String snapshotName = null;
private String directoryName = null;
@@ -204,7 +204,7 @@ public class SnapShooter {
try {
result.accept(createSnapshot(indexCommit));
} catch (Exception e) {
- LOG.error("Exception while creating snapshot", e);
+ log.error("Exception while creating snapshot", e);
NamedList snapShootDetails = new NamedList<>();
snapShootDetails.add("exception", e.getMessage());
result.accept(snapShootDetails);
@@ -215,7 +215,7 @@ public class SnapShooter {
try {
deleteOldBackups(numberToKeep);
} catch (IOException e) {
- LOG.warn("Unable to delete old snapshots ", e);
+ log.warn("Unable to delete old snapshots ", e);
}
}
}).start();
@@ -225,7 +225,7 @@ public class SnapShooter {
// note: remember to reserve the indexCommit first so it won't get deleted concurrently
protected NamedList createSnapshot(final IndexCommit indexCommit) throws Exception {
assert indexCommit != null;
- LOG.info("Creating backup snapshot " + (snapshotName == null ? "<not named>" : snapshotName) + " at " + baseSnapDirPath);
+ log.info("Creating backup snapshot " + (snapshotName == null ? "<not named>" : snapshotName) + " at " + baseSnapDirPath);
boolean success = false;
try {
NamedList<Object> details = new NamedList<>();
@@ -245,7 +245,7 @@ public class SnapShooter {
details.add("status", "success");
details.add("snapshotCompletedAt", new Date().toString());//bad; should be Instant.now().toString()
details.add("snapshotName", snapshotName);
- LOG.info("Done creating backup snapshot: " + (snapshotName == null ? "<not named>" : snapshotName) +
+ log.info("Done creating backup snapshot: " + (snapshotName == null ? "<not named>" : snapshotName) +
" at " + baseSnapDirPath);
success = true;
return details;
@@ -254,7 +254,7 @@ public class SnapShooter {
try {
backupRepo.deleteDirectory(snapshotDirPath);
} catch (Exception excDuringDelete) {
- LOG.warn("Failed to delete "+snapshotDirPath+" after snapshot creation failed due to: "+excDuringDelete);
+ log.warn("Failed to delete "+snapshotDirPath+" after snapshot creation failed due to: "+excDuringDelete);
}
}
}
@@ -284,7 +284,7 @@ public class SnapShooter {
}
protected void deleteNamedSnapshot(ReplicationHandler replicationHandler) {
- LOG.info("Deleting snapshot: " + snapshotName);
+ log.info("Deleting snapshot: " + snapshotName);
NamedList<Object> details = new NamedList<>();
@@ -297,7 +297,7 @@ public class SnapShooter {
} catch (IOException e) {
details.add("status", "Unable to delete snapshot: " + snapshotName);
- LOG.warn("Unable to delete snapshot: " + snapshotName, e);
+ log.warn("Unable to delete snapshot: " + snapshotName, e);
}
replicationHandler.snapShootDetails = details;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/handler/admin/AutoscalingHistoryHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/AutoscalingHistoryHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/AutoscalingHistoryHandler.java
index 69fac0b..ae99453 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/AutoscalingHistoryHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/AutoscalingHistoryHandler.java
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
* collection.
*/
public class AutoscalingHistoryHandler extends RequestHandlerBase implements PermissionNameProvider {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String SYSTEM_COLLECTION_PARAM = "systemCollection";
@@ -134,7 +134,7 @@ public class AutoscalingHistoryHandler extends RequestHandlerBase implements Per
if ((e instanceof SolrException) && e.getMessage().contains("Collection not found")) {
// relatively benign
String msg = "Collection " + collection + " does not exist.";
- LOG.info(msg);
+ log.info(msg);
rsp.getValues().add("error", msg);
} else {
throw e;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
index 2ec8cc4..27eaedd 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
@@ -122,7 +122,7 @@ import org.slf4j.LoggerFactory;
public class QueryComponent extends SearchComponent
{
public static final String COMPONENT_NAME = "query";
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void prepare(ResponseBuilder rb) throws IOException
@@ -299,7 +299,7 @@ public class QueryComponent extends SearchComponent
@Override
public void process(ResponseBuilder rb) throws IOException
{
- LOG.debug("process: {}", rb.req.getParams());
+ log.debug("process: {}", rb.req.getParams());
SolrQueryRequest req = rb.req;
SolrParams params = req.getParams();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
index b207384..6e0323c 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
@@ -87,7 +87,7 @@ import org.slf4j.LoggerFactory;
* @since solr 1.3
*/
public class SpellCheckComponent extends SearchComponent implements SolrCoreAware, SpellingParams {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final boolean DEFAULT_ONLY_MORE_POPULAR = false;
@@ -258,10 +258,10 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
}
}
} catch (IOException e){
- LOG.error(e.toString());
+ log.error(e.toString());
return null;
} catch (SyntaxError e) {
- LOG.error(e.toString());
+ log.error(e.toString());
return null;
}
@@ -407,7 +407,7 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
"Unable to read spelling info for shard: " + srsp.getShard(), e);
}
- LOG.info(srsp.getShard() + " " + nl);
+ log.info(srsp.getShard() + " " + nl);
if (nl != null) {
mergeData.totalNumberShardResponses++;
collectShardSuggestions(nl, mergeData);
@@ -704,7 +704,7 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
@Override
public void inform(SolrCore core) {
if (initParams != null) {
- LOG.info("Initializing spell checkers");
+ log.info("Initializing spell checkers");
boolean hasDefault = false;
for (int i = 0; i < initParams.size(); i++) {
if (initParams.getName(i).equals("spellchecker")) {
@@ -728,7 +728,7 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
//ensure that there is at least one query converter defined
if (queryConverters.size() == 0) {
- LOG.trace("No queryConverter defined, using default converter");
+ log.trace("No queryConverter defined, using default converter");
queryConverters.put("queryConverter", new SpellingQueryConverter());
}
@@ -778,7 +778,7 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
boolean buildOnCommit = Boolean.parseBoolean((String) spellchecker.get("buildOnCommit"));
boolean buildOnOptimize = Boolean.parseBoolean((String) spellchecker.get("buildOnOptimize"));
if (buildOnCommit || buildOnOptimize) {
- LOG.info("Registering newSearcher listener for spellchecker: " + checker.getDictionaryName());
+ log.info("Registering newSearcher listener for spellchecker: " + checker.getDictionaryName());
core.registerNewSearcherListener(new SpellCheckerListener(core, checker, buildOnCommit, buildOnOptimize));
}
} else {
@@ -810,11 +810,11 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
if (currentSearcher == null) {
// firstSearcher event
try {
- LOG.info("Loading spell index for spellchecker: "
+ log.info("Loading spell index for spellchecker: "
+ checker.getDictionaryName());
checker.reload(core, newSearcher);
} catch (IOException e) {
- LOG.error( "Exception in reloading spell check index for spellchecker: " + checker.getDictionaryName(), e);
+ log.error( "Exception in reloading spell check index for spellchecker: " + checker.getDictionaryName(), e);
}
} else {
// newSearcher event
@@ -824,7 +824,7 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
if (newSearcher.getIndexReader().leaves().size() == 1) {
buildSpellIndex(newSearcher);
} else {
- LOG.info("Index is not optimized therefore skipping building spell check index for: " + checker.getDictionaryName());
+ log.info("Index is not optimized therefore skipping building spell check index for: " + checker.getDictionaryName());
}
}
}
@@ -833,10 +833,10 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
private void buildSpellIndex(SolrIndexSearcher newSearcher) {
try {
- LOG.info("Building spell index for spell checker: " + checker.getDictionaryName());
+ log.info("Building spell index for spell checker: " + checker.getDictionaryName());
checker.build(core, newSearcher);
} catch (Exception e) {
- LOG.error(
+ log.error(
"Exception in building spell check index for spellchecker: " + checker.getDictionaryName(), e);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java b/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java
index cba7e93..2d6fdb1 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java
@@ -65,7 +65,7 @@ import org.slf4j.LoggerFactory;
* and for initializing them as specified by SolrConfig
*/
public class SuggestComponent extends SearchComponent implements SolrCoreAware, SuggesterParams, Accountable, SolrMetricProducer {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ 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";
@@ -116,7 +116,7 @@ public class SuggestComponent extends SearchComponent implements SolrCoreAware,
@Override
public void inform(SolrCore core) {
if (initParams != null) {
- LOG.info("Initializing SuggestComponent");
+ log.info("Initializing SuggestComponent");
boolean hasDefault = false;
for (int i = 0; i < initParams.size(); i++) {
if (initParams.getName(i).equals(CONFIG_PARAM_LABEL)) {
@@ -152,7 +152,7 @@ public class SuggestComponent extends SearchComponent implements SolrCoreAware,
if (buildOnCommit || buildOnOptimize || buildOnStartup) {
SuggesterListener listener = new SuggesterListener(core, suggester, buildOnCommit, buildOnOptimize, buildOnStartup, core.isReloaded());
- LOG.info("Registering searcher listener for suggester: " + suggester.getName() + " - " + listener);
+ log.info("Registering searcher listener for suggester: " + suggester.getName() + " - " + listener);
core.registerFirstSearcherListener(listener);
core.registerNewSearcherListener(listener);
}
@@ -165,7 +165,7 @@ public class SuggestComponent extends SearchComponent implements SolrCoreAware,
@Override
public void prepare(ResponseBuilder rb) throws IOException {
SolrParams params = rb.req.getParams();
- LOG.info("SuggestComponent prepare with : " + params);
+ log.info("SuggestComponent prepare with : " + params);
if (!params.getBool(COMPONENT_NAME, false)) {
return;
}
@@ -197,7 +197,7 @@ public class SuggestComponent extends SearchComponent implements SolrCoreAware,
@Override
public int distributedProcess(ResponseBuilder rb) {
SolrParams params = rb.req.getParams();
- LOG.info("SuggestComponent distributedProcess with : " + params);
+ log.info("SuggestComponent distributedProcess with : " + params);
if (rb.stage < ResponseBuilder.STAGE_EXECUTE_QUERY)
return ResponseBuilder.STAGE_EXECUTE_QUERY;
if (rb.stage == ResponseBuilder.STAGE_EXECUTE_QUERY) {
@@ -219,7 +219,7 @@ public class SuggestComponent extends SearchComponent implements SolrCoreAware,
@Override
public void process(ResponseBuilder rb) throws IOException {
SolrParams params = rb.req.getParams();
- LOG.info("SuggestComponent process with : " + params);
+ log.info("SuggestComponent process with : " + params);
if (!params.getBool(COMPONENT_NAME, false) || suggesters.isEmpty()) {
return;
}
@@ -274,7 +274,7 @@ public class SuggestComponent extends SearchComponent implements SolrCoreAware,
@Override
public void finishStage(ResponseBuilder rb) {
SolrParams params = rb.req.getParams();
- LOG.info("SuggestComponent finishStage with : " + params);
+ log.info("SuggestComponent finishStage with : " + params);
if (!params.getBool(COMPONENT_NAME, false) || rb.stage != ResponseBuilder.STAGE_GET_FIELDS)
return;
int count = params.getInt(SUGGEST_COUNT, 1);
@@ -289,7 +289,7 @@ public class SuggestComponent extends SearchComponent implements SolrCoreAware,
@SuppressWarnings("unchecked")
Map<String, SimpleOrderedMap<NamedList<Object>>> namedList =
(Map<String, SimpleOrderedMap<NamedList<Object>>>) resp.get(SuggesterResultLabels.SUGGEST);
- LOG.info(srsp.getShard() + " : " + namedList);
+ log.info(srsp.getShard() + " : " + namedList);
suggesterResults.add(toSuggesterResult(namedList));
}
}
@@ -508,20 +508,20 @@ public class SuggestComponent extends SearchComponent implements SolrCoreAware,
SolrIndexSearcher currentSearcher) {
long thisCallCount = callCount.incrementAndGet();
if (isCoreReload && thisCallCount == 1) {
- LOG.info("Skipping first newSearcher call for suggester " + suggester + " in core reload");
+ log.info("Skipping first newSearcher call for suggester " + suggester + " in core reload");
return;
} else if (thisCallCount == 1 || (isCoreReload && thisCallCount == 2)) {
if (buildOnStartup) {
- LOG.info("buildOnStartup: " + suggester.getName());
+ log.info("buildOnStartup: " + suggester.getName());
buildSuggesterIndex(newSearcher);
}
} else {
if (buildOnCommit) {
- LOG.info("buildOnCommit: " + suggester.getName());
+ log.info("buildOnCommit: " + suggester.getName());
buildSuggesterIndex(newSearcher);
} else if (buildOnOptimize) {
if (newSearcher.getIndexReader().leaves().size() == 1) {
- LOG.info("buildOnOptimize: " + suggester.getName());
+ log.info("buildOnOptimize: " + suggester.getName());
buildSuggesterIndex(newSearcher);
}
}
@@ -533,7 +533,7 @@ public class SuggestComponent extends SearchComponent implements SolrCoreAware,
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);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/metrics/reporters/ReporterClientCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/metrics/reporters/ReporterClientCache.java b/solr/core/src/java/org/apache/solr/metrics/reporters/ReporterClientCache.java
index 5745dec..4cdb78f 100644
--- a/solr/core/src/java/org/apache/solr/metrics/reporters/ReporterClientCache.java
+++ b/solr/core/src/java/org/apache/solr/metrics/reporters/ReporterClientCache.java
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
* {@link org.apache.solr.metrics.SolrMetricReporter}.
*/
public class ReporterClientCache<T> implements Closeable {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final Map<String, T> cache = new ConcurrentHashMap<>();
@@ -59,7 +59,7 @@ public class ReporterClientCache<T> implements Closeable {
item = clientProvider.get();
cache.put(id, item);
} catch (Exception e) {
- LOG.warn("Error providing a new client for id=" + id, e);
+ log.warn("Error providing a new client for id=" + id, e);
item = null;
}
}
@@ -75,7 +75,7 @@ public class ReporterClientCache<T> implements Closeable {
try {
((Closeable)client).close();
} catch (Exception e) {
- LOG.warn("Error closing client " + client + ", ignoring...", e);
+ log.warn("Error closing client " + client + ", ignoring...", e);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/metrics/reporters/jmx/JmxMetricsReporter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/metrics/reporters/jmx/JmxMetricsReporter.java b/solr/core/src/java/org/apache/solr/metrics/reporters/jmx/JmxMetricsReporter.java
index 54da5fa..ebf47e6 100644
--- a/solr/core/src/java/org/apache/solr/metrics/reporters/jmx/JmxMetricsReporter.java
+++ b/solr/core/src/java/org/apache/solr/metrics/reporters/jmx/JmxMetricsReporter.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* </ul>
*/
public class JmxMetricsReporter implements Reporter, Closeable {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String INSTANCE_TAG = "_instanceTag";
@@ -520,11 +520,11 @@ public class JmxMetricsReporter implements Reporter, Closeable {
private void registerMBean(Object mBean, ObjectName objectName) throws InstanceAlreadyExistsException, JMException {
// remove previous bean if exists
if (mBeanServer.isRegistered(objectName)) {
- if (LOG.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
Set<ObjectInstance> objects = mBeanServer.queryMBeans(objectName, null);
- LOG.debug("## removing existing " + objects.size() + " bean(s) for " + objectName.getCanonicalName() + ", current tag=" + tag + ":");
+ log.debug("## removing existing " + objects.size() + " bean(s) for " + objectName.getCanonicalName() + ", current tag=" + tag + ":");
for (ObjectInstance inst : objects) {
- LOG.debug("## - tag=" + mBeanServer.getAttribute(inst.getObjectName(), INSTANCE_TAG));
+ log.debug("## - tag=" + mBeanServer.getAttribute(inst.getObjectName(), INSTANCE_TAG));
}
}
mBeanServer.unregisterMBean(objectName);
@@ -538,7 +538,7 @@ public class JmxMetricsReporter implements Reporter, Closeable {
} else {
registered.put(objectName, objectName);
}
- LOG.debug("## registered " + objectInstance.getObjectName().getCanonicalName() + ", tag=" + tag);
+ log.debug("## registered " + objectInstance.getObjectName().getCanonicalName() + ", tag=" + tag);
}
private void unregisterMBean(ObjectName originalObjectName) throws InstanceNotFoundException, MBeanRegistrationException {
@@ -548,7 +548,7 @@ public class JmxMetricsReporter implements Reporter, Closeable {
}
Set<ObjectInstance> objects = mBeanServer.queryMBeans(objectName, exp);
for (ObjectInstance o : objects) {
- LOG.debug("## Unregistered " + o.getObjectName().getCanonicalName() + ", tag=" + tag);
+ log.debug("## Unregistered " + o.getObjectName().getCanonicalName() + ", tag=" + tag);
mBeanServer.unregisterMBean(o.getObjectName());
}
}
@@ -566,9 +566,9 @@ public class JmxMetricsReporter implements Reporter, Closeable {
}
}
} catch (InstanceAlreadyExistsException e) {
- LOG.debug("Unable to register gauge", e);
+ log.debug("Unable to register gauge", e);
} catch (JMException e) {
- LOG.warn("Unable to register gauge", e);
+ log.warn("Unable to register gauge", e);
}
}
@@ -578,9 +578,9 @@ public class JmxMetricsReporter implements Reporter, Closeable {
final ObjectName objectName = createName("gauges", name);
unregisterMBean(objectName);
} catch (InstanceNotFoundException e) {
- LOG.debug("Unable to unregister gauge", e);
+ log.debug("Unable to unregister gauge", e);
} catch (MBeanRegistrationException e) {
- LOG.warn("Unable to unregister gauge", e);
+ log.warn("Unable to unregister gauge", e);
}
}
@@ -592,9 +592,9 @@ public class JmxMetricsReporter implements Reporter, Closeable {
registerMBean(new JmxCounter(counter, objectName, tag), objectName);
}
} catch (InstanceAlreadyExistsException e) {
- LOG.debug("Unable to register counter", e);
+ log.debug("Unable to register counter", e);
} catch (JMException e) {
- LOG.warn("Unable to register counter", e);
+ log.warn("Unable to register counter", e);
}
}
@@ -604,9 +604,9 @@ public class JmxMetricsReporter implements Reporter, Closeable {
final ObjectName objectName = createName("counters", name);
unregisterMBean(objectName);
} catch (InstanceNotFoundException e) {
- LOG.debug("Unable to unregister counter", e);
+ log.debug("Unable to unregister counter", e);
} catch (MBeanRegistrationException e) {
- LOG.warn("Unable to unregister counter", e);
+ log.warn("Unable to unregister counter", e);
}
}
@@ -618,9 +618,9 @@ public class JmxMetricsReporter implements Reporter, Closeable {
registerMBean(new JmxHistogram(histogram, objectName, tag), objectName);
}
} catch (InstanceAlreadyExistsException e) {
- LOG.debug("Unable to register histogram", e);
+ log.debug("Unable to register histogram", e);
} catch (JMException e) {
- LOG.warn("Unable to register histogram", e);
+ log.warn("Unable to register histogram", e);
}
}
@@ -630,9 +630,9 @@ public class JmxMetricsReporter implements Reporter, Closeable {
final ObjectName objectName = createName("histograms", name);
unregisterMBean(objectName);
} catch (InstanceNotFoundException e) {
- LOG.debug("Unable to unregister histogram", e);
+ log.debug("Unable to unregister histogram", e);
} catch (MBeanRegistrationException e) {
- LOG.warn("Unable to unregister histogram", e);
+ log.warn("Unable to unregister histogram", e);
}
}
@@ -644,9 +644,9 @@ public class JmxMetricsReporter implements Reporter, Closeable {
registerMBean(new JmxMeter(meter, objectName, rateUnit, tag), objectName);
}
} catch (InstanceAlreadyExistsException e) {
- LOG.debug("Unable to register meter", e);
+ log.debug("Unable to register meter", e);
} catch (JMException e) {
- LOG.warn("Unable to register meter", e);
+ log.warn("Unable to register meter", e);
}
}
@@ -656,9 +656,9 @@ public class JmxMetricsReporter implements Reporter, Closeable {
final ObjectName objectName = createName("meters", name);
unregisterMBean(objectName);
} catch (InstanceNotFoundException e) {
- LOG.debug("Unable to unregister meter", e);
+ log.debug("Unable to unregister meter", e);
} catch (MBeanRegistrationException e) {
- LOG.warn("Unable to unregister meter", e);
+ log.warn("Unable to unregister meter", e);
}
}
@@ -670,9 +670,9 @@ public class JmxMetricsReporter implements Reporter, Closeable {
registerMBean(new JmxTimer(timer, objectName, rateUnit, durationUnit, tag), objectName);
}
} catch (InstanceAlreadyExistsException e) {
- LOG.debug("Unable to register timer", e);
+ log.debug("Unable to register timer", e);
} catch (JMException e) {
- LOG.warn("Unable to register timer", e);
+ log.warn("Unable to register timer", e);
}
}
@@ -682,9 +682,9 @@ public class JmxMetricsReporter implements Reporter, Closeable {
final ObjectName objectName = createName("timers", name);
unregisterMBean(objectName);
} catch (InstanceNotFoundException e) {
- LOG.debug("Unable to unregister timer", e);
+ log.debug("Unable to unregister timer", e);
} catch (MBeanRegistrationException e) {
- LOG.warn("Unable to unregister timer", e);
+ log.warn("Unable to unregister timer", e);
}
}
@@ -697,9 +697,9 @@ public class JmxMetricsReporter implements Reporter, Closeable {
try {
unregisterMBean(name);
} catch (InstanceNotFoundException e) {
- LOG.debug("Unable to unregister metric", e);
+ log.debug("Unable to unregister metric", e);
} catch (MBeanRegistrationException e) {
- LOG.warn("Unable to unregister metric", e);
+ log.warn("Unable to unregister metric", e);
}
}
registered.clear();
@@ -737,7 +737,7 @@ public class JmxMetricsReporter implements Reporter, Closeable {
} else if (v instanceof Gauge) {
listener.onGaugeAdded(k, (Gauge)v);
} else {
- LOG.warn("Unknown metric type " + v.getClass().getName() + " for metric '" + k + "', ignoring");
+ log.warn("Unknown metric type " + v.getClass().getName() + " for metric '" + k + "', ignoring");
}
});
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrShardReporter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrShardReporter.java b/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrShardReporter.java
index af794fc..e1f0afa 100644
--- a/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrShardReporter.java
+++ b/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrShardReporter.java
@@ -63,7 +63,7 @@ public class SolrShardReporter extends SolrCoreReporter {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final List<String> DEFAULT_FILTERS = new ArrayList(){{
- add("TLOG.*");
+ add("Tlog.*");
add("CORE\\.fs.*");
add("REPLICATION.*");
add("INDEX\\.flush.*");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
index 2cc6ec4..c054757 100644
--- a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
+++ b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
@@ -107,7 +107,7 @@ import static org.apache.solr.common.params.CommonParams.SORT;
* to leverage any of its functionality.
*/
public class SimpleFacets {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/** The main set of documents all facet counts should be relative to */
protected DocSet docsOrig;
@@ -518,7 +518,7 @@ public class SimpleFacets {
if (ft.isPointField() && mincount <= 0) { // default is mincount=0. See SOLR-10033 & SOLR-11174.
String warningMessage
= "Raising facet.mincount from " + mincount + " to 1, because field " + field + " is Points-based.";
- LOG.warn(warningMessage);
+ log.warn(warningMessage);
List<String> warnings = (List<String>)rb.rsp.getResponseHeader().get("warnings");
if (null == warnings) {
warnings = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java b/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
index b841a03..81172f3 100644
--- a/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
+++ b/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
public class BinaryResponseWriter implements BinaryQueryResponseWriter {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public void write(OutputStream out, SolrQueryRequest req, SolrQueryResponse response) throws IOException {
@@ -103,7 +103,7 @@ public class BinaryResponseWriter implements BinaryQueryResponseWriter {
try {
o = DocsStreamer.getValue(sf, f);
} catch (Exception e) {
- LOG.warn("Error reading a field : " + o, e);
+ log.warn("Error reading a field : " + o, e);
}
}
return o;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/schema/JsonPreAnalyzedParser.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/JsonPreAnalyzedParser.java b/solr/core/src/java/org/apache/solr/schema/JsonPreAnalyzedParser.java
index dd2c297..b937faa 100644
--- a/solr/core/src/java/org/apache/solr/schema/JsonPreAnalyzedParser.java
+++ b/solr/core/src/java/org/apache/solr/schema/JsonPreAnalyzedParser.java
@@ -49,7 +49,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class JsonPreAnalyzedParser implements PreAnalyzedParser {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String VERSION = "1";
@@ -132,7 +132,7 @@ public class JsonPreAnalyzedParser implements PreAnalyzedParser {
try {
tokenStart = Integer.parseInt(String.valueOf(obj));
} catch (NumberFormatException nfe) {
- LOG.warn("Invalid " + OFFSET_START_KEY + " attribute, skipped: '" + obj + "'");
+ log.warn("Invalid " + OFFSET_START_KEY + " attribute, skipped: '" + obj + "'");
hasOffsetStart = false;
}
}
@@ -145,7 +145,7 @@ public class JsonPreAnalyzedParser implements PreAnalyzedParser {
try {
tokenEnd = Integer.parseInt(String.valueOf(obj));
} catch (NumberFormatException nfe) {
- LOG.warn("Invalid " + OFFSET_END_KEY + " attribute, skipped: '" + obj + "'");
+ log.warn("Invalid " + OFFSET_END_KEY + " attribute, skipped: '" + obj + "'");
hasOffsetEnd = false;
}
}
@@ -158,7 +158,7 @@ public class JsonPreAnalyzedParser implements PreAnalyzedParser {
try {
posIncr = Integer.parseInt(String.valueOf(obj));
} catch (NumberFormatException nfe) {
- LOG.warn("Invalid " + POSINCR_KEY + " attribute, skipped: '" + obj + "'");
+ log.warn("Invalid " + POSINCR_KEY + " attribute, skipped: '" + obj + "'");
}
}
PositionIncrementAttribute patt = parent.addAttribute(PositionIncrementAttribute.class);
@@ -178,13 +178,13 @@ public class JsonPreAnalyzedParser implements PreAnalyzedParser {
FlagsAttribute flags = parent.addAttribute(FlagsAttribute.class);
flags.setFlags(f);
} catch (NumberFormatException nfe) {
- LOG.warn("Invalid " + FLAGS_KEY + " attribute, skipped: '" + e.getValue() + "'");
+ log.warn("Invalid " + FLAGS_KEY + " attribute, skipped: '" + e.getValue() + "'");
}
} else if (key.equals(TYPE_KEY)) {
TypeAttribute tattr = parent.addAttribute(TypeAttribute.class);
tattr.setType(String.valueOf(e.getValue()));
} else {
- LOG.warn("Unknown attribute, skipped: " + e.getKey() + "=" + e.getValue());
+ log.warn("Unknown attribute, skipped: " + e.getKey() + "=" + e.getValue());
}
}
// handle offset attr
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java b/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java
index f5affe1..368bfde 100644
--- a/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java
+++ b/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java
@@ -52,7 +52,7 @@ import static org.apache.solr.common.params.CommonParams.JSON;
* optionally with an independent stored value of a field.
*/
public class PreAnalyzedField extends TextField implements HasImplicitIndexAnalyzer {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/** Init argument name. Value is a fully-qualified class name of the parser
* that implements {@link PreAnalyzedParser}.
@@ -83,7 +83,7 @@ public class PreAnalyzedField extends TextField implements HasImplicitIndexAnaly
Constructor<?> c = implClazz.getConstructor(new Class<?>[0]);
parser = (PreAnalyzedParser) c.newInstance(new Object[0]);
} catch (Exception e) {
- LOG.warn("Can't use the configured PreAnalyzedParser class '" + implName +
+ log.warn("Can't use the configured PreAnalyzedParser class '" + implName +
"', using default " + DEFAULT_IMPL, e);
parser = new JsonPreAnalyzedParser();
}
@@ -124,7 +124,7 @@ public class PreAnalyzedField extends TextField implements HasImplicitIndexAnaly
try {
f = fromString(field, String.valueOf(value));
} catch (Exception e) {
- LOG.warn("Error parsing pre-analyzed field '" + field.getName() + "'", e);
+ log.warn("Error parsing pre-analyzed field '" + field.getName() + "'", e);
return null;
}
return f;
@@ -168,8 +168,8 @@ public class PreAnalyzedField extends TextField implements HasImplicitIndexAnaly
*/
public static org.apache.lucene.document.FieldType createFieldType(SchemaField field) {
if (!field.indexed() && !field.stored()) {
- if (LOG.isTraceEnabled())
- LOG.trace("Ignoring unindexed/unstored field: " + field);
+ if (log.isTraceEnabled())
+ log.trace("Ignoring unindexed/unstored field: " + field);
return null;
}
org.apache.lucene.document.FieldType newType = new org.apache.lucene.document.FieldType();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java
index 4654a5c..9b48116 100644
--- a/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java
@@ -79,7 +79,7 @@ public class SurroundQParserPlugin extends QParserPlugin {
try {
this.maxBasicQueries = Integer.parseInt(mbqparam);
} catch (Exception e) {
- LOG.warn("Couldn't parse maxBasicQueries value " + mbqparam +", using default of 1000");
+ log.warn("Couldn't parse maxBasicQueries value " + mbqparam +", using default of 1000");
this.maxBasicQueries = DEFMAXBASICQUERIES;
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/search/stats/ExactSharedStatsCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/stats/ExactSharedStatsCache.java b/solr/core/src/java/org/apache/solr/search/stats/ExactSharedStatsCache.java
index de4f7ec..c7758ff 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/ExactSharedStatsCache.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/ExactSharedStatsCache.java
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
public class ExactSharedStatsCache extends ExactStatsCache {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// local stats obtained from shard servers
private final Map<String,Map<String,TermStats>> perShardTermStats = new ConcurrentHashMap<>();
@@ -40,7 +40,7 @@ public class ExactSharedStatsCache extends ExactStatsCache {
@Override
public StatsSource get(SolrQueryRequest req) {
- LOG.debug("total={}, cache {}", currentGlobalColStats, currentGlobalTermStats.size());
+ log.debug("total={}, cache {}", currentGlobalColStats, currentGlobalTermStats.size());
return new ExactStatsSource(currentGlobalTermStats, currentGlobalColStats);
}
@@ -55,7 +55,7 @@ public class ExactSharedStatsCache extends ExactStatsCache {
@Override
protected void printStats(SolrQueryRequest req) {
- LOG.debug("perShardColStats={}, perShardTermStats={}", perShardColStats, perShardTermStats);
+ log.debug("perShardColStats={}, perShardTermStats={}", perShardColStats, perShardTermStats);
}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/search/stats/ExactStatsCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/stats/ExactStatsCache.java b/solr/core/src/java/org/apache/solr/search/stats/ExactStatsCache.java
index 819d371..290b7c1 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/ExactStatsCache.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/ExactStatsCache.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
* query terms (and collection statistics for term fields).
*/
public class ExactStatsCache extends StatsCache {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// experimenting with strategy that takes more RAM, but also doesn't share memory
// across threads
@@ -74,7 +74,7 @@ public class ExactStatsCache extends StatsCache {
if (currentGlobalTermStats == null) {
currentGlobalTermStats = Collections.emptyMap();
}
- LOG.debug("Returning StatsSource. Collection stats={}, Term stats size= {}", currentGlobalColStats, currentGlobalTermStats.size());
+ log.debug("Returning StatsSource. Collection stats={}, Term stats size= {}", currentGlobalColStats, currentGlobalTermStats.size());
return new ExactStatsSource(currentGlobalTermStats, currentGlobalColStats);
}
@@ -95,7 +95,7 @@ public class ExactStatsCache extends StatsCache {
public void mergeToGlobalStats(SolrQueryRequest req, List<ShardResponse> responses) {
Set<Object> allTerms = new HashSet<>();
for (ShardResponse r : responses) {
- LOG.debug("Merging to global stats, shard={}, response={}", r.getShard(), r.getSolrResponse().getResponse());
+ log.debug("Merging to global stats, shard={}, response={}", r.getShard(), r.getSolrResponse().getResponse());
String shard = r.getShard();
SolrResponse res = r.getSolrResponse();
NamedList<Object> nl = res.getResponse();
@@ -116,7 +116,7 @@ public class ExactStatsCache extends StatsCache {
if (allTerms.size() > 0) {
req.getContext().put(TERMS_KEY, Lists.newArrayList(allTerms));
}
- if (LOG.isDebugEnabled()) printStats(req);
+ if (log.isDebugEnabled()) printStats(req);
}
protected void addToPerShardColStats(SolrQueryRequest req, String shard, Map<String,CollectionStats> colStats) {
@@ -137,7 +137,7 @@ public class ExactStatsCache extends StatsCache {
if (perShardColStats == null) {
perShardColStats = Collections.emptyMap();
}
- LOG.debug("perShardColStats={}, perShardTermStats={}", perShardColStats, perShardTermStats);
+ log.debug("perShardColStats={}, perShardTermStats={}", perShardColStats, perShardTermStats);
}
protected void addToPerShardTermStats(SolrQueryRequest req, String shard, String termStatsString) {
@@ -182,19 +182,19 @@ public class ExactStatsCache extends StatsCache {
if (statsMap.size() != 0) { //Don't add empty keys
String termStatsString = StatsUtil.termStatsMapToString(statsMap);
rb.rsp.add(TERM_STATS_KEY, termStatsString);
- if (LOG.isDebugEnabled()) {
- LOG.debug("termStats={}, terms={}, numDocs={}", termStatsString, terms, searcher.maxDoc());
+ if (log.isDebugEnabled()) {
+ log.debug("termStats={}, terms={}, numDocs={}", termStatsString, terms, searcher.maxDoc());
}
}
if (colMap.size() != 0){
String colStatsString = StatsUtil.colStatsMapToString(colMap);
rb.rsp.add(COL_STATS_KEY, colStatsString);
- if (LOG.isDebugEnabled()) {
- LOG.debug("collectionStats={}, terms={}, numDocs={}", colStatsString, terms, searcher.maxDoc());
+ if (log.isDebugEnabled()) {
+ log.debug("collectionStats={}, terms={}, numDocs={}", colStatsString, terms, searcher.maxDoc());
}
}
} catch (IOException e) {
- LOG.error("Error collecting local stats, query='" + q.toString() + "'", e);
+ log.error("Error collecting local stats, query='" + q.toString() + "'", e);
throw new SolrException(ErrorCode.SERVER_ERROR, "Error collecting local stats.", e);
}
}
@@ -248,7 +248,7 @@ public class ExactStatsCache extends StatsCache {
g.add(termStats);
}
}
- LOG.debug("terms={}, termStats={}", terms, globalTermStats);
+ log.debug("terms={}, termStats={}", terms, globalTermStats);
// need global TermStats here...
params.add(TERM_STATS_KEY, StatsUtil.termStatsMapToString(globalTermStats));
}
@@ -283,7 +283,7 @@ public class ExactStatsCache extends StatsCache {
}
}
}
- LOG.debug("Global collection stats={}", globalColStats);
+ log.debug("Global collection stats={}", globalColStats);
if (globalTermStats == null) return;
Map<String,TermStats> termStats = StatsUtil.termStatsMapFromString(globalTermStats);
if (termStats != null) {
@@ -329,7 +329,7 @@ public class ExactStatsCache extends StatsCache {
// see returnLocalStats, if docFreq == 0, they are not added anyway
// Not sure we need a warning here
if (termStats == null) {
- LOG.debug("Missing global termStats info for term={}, using local stats", term);
+ log.debug("Missing global termStats info for term={}, using local stats", term);
return localSearcher.localTermStatistics(term, context);
} else {
return termStats.toTermStatistics();
@@ -341,7 +341,7 @@ public class ExactStatsCache extends StatsCache {
throws IOException {
CollectionStats colStats = colStatsCache.get(field);
if (colStats == null) {
- LOG.debug("Missing global colStats info for field={}, using local", field);
+ log.debug("Missing global colStats info for field={}, using local", field);
return localSearcher.localCollectionStatistics(field);
} else {
return colStats.toCollectionStatistics();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java b/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java
index 94e3a5f..c94695a 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
* that is updated with the global statistics on every request.
*/
public class LRUStatsCache extends ExactStatsCache {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// local stats obtained from shard servers
private final Map<String,SolrCache<String,TermStats>> perShardTermStats = new ConcurrentHashMap<>();
@@ -65,7 +65,7 @@ public class LRUStatsCache extends ExactStatsCache {
@Override
public StatsSource get(SolrQueryRequest req) {
- LOG.debug("## GET total={}, cache {}", currentGlobalColStats , currentGlobalTermStats.size());
+ log.debug("## GET total={}, cache {}", currentGlobalColStats , currentGlobalTermStats.size());
return new LRUStatsSource(currentGlobalTermStats, currentGlobalColStats);
}
@@ -120,7 +120,7 @@ public class LRUStatsCache extends ExactStatsCache {
@Override
protected void printStats(SolrQueryRequest req) {
- LOG.debug("## MERGED: perShardColStats={}, perShardTermStats={}", perShardColStats, perShardTermStats);
+ log.debug("## MERGED: perShardColStats={}, perShardTermStats={}", perShardColStats, perShardTermStats);
}
static class LRUStatsSource extends StatsSource {
@@ -136,7 +136,7 @@ public class LRUStatsCache extends ExactStatsCache {
throws IOException {
TermStats termStats = termStatsCache.get(term.toString());
if (termStats == null) {
- LOG.debug("## Missing global termStats info: {}, using local", term);
+ log.debug("## Missing global termStats info: {}, using local", term);
return localSearcher.localTermStatistics(term, context);
} else {
return termStats.toTermStatistics();
@@ -148,7 +148,7 @@ public class LRUStatsCache extends ExactStatsCache {
throws IOException {
CollectionStats colStats = colStatsCache.get(field);
if (colStats == null) {
- LOG.debug("## Missing global colStats info: {}, using local", field);
+ log.debug("## Missing global colStats info: {}, using local", field);
return localSearcher.localCollectionStatistics(field);
} else {
return colStats.toCollectionStatistics();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java b/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java
index 90395f5..a0fb5b6 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java
@@ -34,11 +34,11 @@ import org.slf4j.LoggerFactory;
* uses local term statistics.
*/
public class LocalStatsCache extends StatsCache {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public StatsSource get(SolrQueryRequest req) {
- LOG.debug("## GET {}", req);
+ log.debug("## GET {}", req);
return new LocalStatsSource();
}
@@ -49,33 +49,33 @@ public class LocalStatsCache extends StatsCache {
// by returning null we don't create additional round-trip request.
@Override
public ShardRequest retrieveStatsRequest(ResponseBuilder rb) {
- LOG.debug("## RDR {}", rb.req);
+ log.debug("## RDR {}", rb.req);
return null;
}
@Override
public void mergeToGlobalStats(SolrQueryRequest req,
List<ShardResponse> responses) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("## MTGD {}", req);
+ if (log.isDebugEnabled()) {
+ log.debug("## MTGD {}", req);
for (ShardResponse r : responses) {
- LOG.debug(" - {}", r);
+ log.debug(" - {}", r);
}
}
}
@Override
public void returnLocalStats(ResponseBuilder rb, SolrIndexSearcher searcher) {
- LOG.debug("## RLD {}", rb.req);
+ log.debug("## RLD {}", rb.req);
}
@Override
public void receiveGlobalStats(SolrQueryRequest req) {
- LOG.debug("## RGD {}", req);
+ log.debug("## RGD {}", req);
}
@Override
public void sendGlobalStats(ResponseBuilder rb, ShardRequest outgoing) {
- LOG.debug("## SGD {}", outgoing);
+ log.debug("## SGD {}", outgoing);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java b/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java
index 3e82e27..21377d0 100644
--- a/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java
+++ b/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
*/
public class StatsUtil {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/**
* Make a String representation of {@link CollectionStats}
@@ -54,12 +54,12 @@ public class StatsUtil {
private static CollectionStats colStatsFromString(String data) {
if (data == null || data.trim().length() == 0) {
- LOG.warn("Invalid empty collection stats string");
+ log.warn("Invalid empty collection stats string");
return null;
}
String[] vals = data.split(",");
if (vals.length != 5) {
- LOG.warn("Invalid collection stats string, num fields " + vals.length
+ log.warn("Invalid collection stats string, num fields " + vals.length
+ " != 5, '" + data + "'");
return null;
}
@@ -72,7 +72,7 @@ public class StatsUtil {
return new CollectionStats(field, maxDoc, docCount, sumTotalTermFreq,
sumDocFreq);
} catch (Exception e) {
- LOG.warn("Invalid collection stats string '" + data + "': "
+ log.warn("Invalid collection stats string '" + data + "': "
+ e.toString());
return null;
}
@@ -88,12 +88,12 @@ public class StatsUtil {
private static Term termFromString(String data) {
if (data == null || data.trim().length() == 0) {
- LOG.warn("Invalid empty term value");
+ log.warn("Invalid empty term value");
return null;
}
int idx = data.indexOf(':');
if (idx == -1) {
- LOG.warn("Invalid term data without ':': '" + data + "'");
+ log.warn("Invalid term data without ':': '" + data + "'");
return null;
}
String field = data.substring(0, idx);
@@ -104,7 +104,7 @@ public class StatsUtil {
// byte[] bytes = Base64.base64ToByteArray(value);
// return new Term(field, new BytesRef(bytes));
} catch (Exception e) {
- LOG.warn("Invalid term value '" + value + "'");
+ log.warn("Invalid term value '" + value + "'");
return null;
}
}
@@ -123,12 +123,12 @@ public class StatsUtil {
private static TermStats termStatsFromString(String data, Term t) {
if (data == null || data.trim().length() == 0) {
- LOG.warn("Invalid empty term stats string");
+ log.warn("Invalid empty term stats string");
return null;
}
String[] vals = data.split(",");
if (vals.length < 2) {
- LOG.warn("Invalid term stats string, num fields " + vals.length
+ log.warn("Invalid term stats string, num fields " + vals.length
+ " < 2, '" + data + "'");
return null;
}
@@ -150,7 +150,7 @@ public class StatsUtil {
termToUse = t;
}
if (termToUse == null) {
- LOG.warn("Missing term in termStats '" + data + "'");
+ log.warn("Missing term in termStats '" + data + "'");
return null;
}
try {
@@ -158,7 +158,7 @@ public class StatsUtil {
long totalTermFreq = Long.parseLong(vals[idx]);
return new TermStats(termToUse.toString(), docFreq, totalTermFreq);
} catch (Exception e) {
- LOG.warn("Invalid termStats string '" + data + "'");
+ log.warn("Invalid termStats string '" + data + "'");
return null;
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/servlet/CheckLoggingConfiguration.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/servlet/CheckLoggingConfiguration.java b/solr/core/src/java/org/apache/solr/servlet/CheckLoggingConfiguration.java
index 1d874e6..202696f 100644
--- a/solr/core/src/java/org/apache/solr/servlet/CheckLoggingConfiguration.java
+++ b/solr/core/src/java/org/apache/solr/servlet/CheckLoggingConfiguration.java
@@ -16,13 +16,15 @@
*/
package org.apache.solr.servlet;
+import java.lang.invoke.MethodHandles;
+
import org.slf4j.LoggerFactory;
final class CheckLoggingConfiguration {
static void check() {
try {
- LoggerFactory.getLogger(CheckLoggingConfiguration.class);
+ LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
} catch (NoClassDefFoundError e) {
throw new NoClassDefFoundError("Failed to initialize Apache Solr: "
+"Could not find necessary SLF4j logging jars. If using Jetty, the SLF4j logging jars need to go in "
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java
index 9188f54..a29d80d 100644
--- a/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java
+++ b/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java
@@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
* @see DirectSpellChecker
*/
public class DirectSolrSpellChecker extends SolrSpellChecker {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// configuration params shared with other spellcheckers
public static final String COMPARATOR_CLASS = AbstractLuceneSpellChecker.COMPARATOR_CLASS;
@@ -96,7 +96,7 @@ public class DirectSolrSpellChecker extends SolrSpellChecker {
SolrParams params = config.toSolrParams();
- LOG.info("init: " + config);
+ log.info("init: " + config);
String name = super.init(config, core);
Comparator<SuggestWord> comp = SuggestWordQueue.DEFAULT_COMPARATOR;
@@ -173,7 +173,7 @@ public class DirectSolrSpellChecker extends SolrSpellChecker {
@Override
public SpellingResult getSuggestions(SpellingOptions options)
throws IOException {
- LOG.debug("getSuggestions: " + options.tokens);
+ log.debug("getSuggestions: " + options.tokens);
SpellingResult result = new SpellingResult();
float accuracy = (options.accuracy == Float.MIN_VALUE) ? checker.getAccuracy() : options.accuracy;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java b/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java
index ad3accf..8b7ce53 100644
--- a/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java
+++ b/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
import static org.apache.solr.common.params.CommonParams.ID;
public class SpellCheckCollator {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private int maxCollations = 1;
private int maxCollationTries = 0;
private int maxCollationEvaluations = 10000;
@@ -73,7 +73,7 @@ public class SpellCheckCollator {
verifyCandidateWithQuery = false;
}
if (queryComponent == null && verifyCandidateWithQuery) {
- LOG.info("Could not find an instance of QueryComponent. Disabling collation verification against the index.");
+ log.info("Could not find an instance of QueryComponent. Disabling collation verification against the index.");
maxTries = 1;
verifyCandidateWithQuery = false;
}
@@ -174,7 +174,7 @@ public class SpellCheckCollator {
/ (float)etce.getNumberScanned() );
}
} catch (Exception e) {
- LOG.warn("Exception trying to re-query to check if a spell check possibility would return any hits.", e);
+ log.warn("Exception trying to re-query to check if a spell check possibility would return any hits.", e);
} finally {
checkResponse.req.close();
}
@@ -193,8 +193,8 @@ public class SpellCheckCollator {
collation.setMisspellingsAndCorrections(misspellingsAndCorrections);
collations.add(collation);
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Collation: " + collationQueryStr + (verifyCandidateWithQuery ? (" will return " + hits + " hits.") : ""));
+ if (log.isDebugEnabled()) {
+ log.debug("Collation: " + collationQueryStr + (verifyCandidateWithQuery ? (" will return " + hits + " hits.") : ""));
}
}
return collations;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java b/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java
index 267d9ad..f33298d 100644
--- a/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java
+++ b/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java
@@ -58,7 +58,7 @@ import static org.apache.solr.spelling.suggest.fst.AnalyzingInfixLookupFactory.C
* {@link Dictionary}
* */
public class SolrSuggester implements Accountable {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/** Name used when an unnamed suggester config is passed */
public static final String DEFAULT_DICT_NAME = "default";
@@ -100,7 +100,7 @@ public class SolrSuggester implements Accountable {
* Lucene suggester
* */
public String init(NamedList<?> config, SolrCore core) {
- LOG.info("init: " + config);
+ log.info("init: " + config);
// read the config
name = config.get(NAME) != null ? (String) config.get(NAME)
@@ -112,7 +112,7 @@ public class SolrSuggester implements Accountable {
if (lookupImpl == null) {
lookupImpl = LookupFactory.DEFAULT_FILE_BASED_DICT;
- LOG.info("No " + LOOKUP_IMPL + " parameter was provided falling back to " + lookupImpl);
+ log.info("No " + LOOKUP_IMPL + " parameter was provided falling back to " + lookupImpl);
}
contextFilterQueryAnalyzer = new TokenizerChain(new StandardTokenizerFactory(Collections.EMPTY_MAP), null);
@@ -128,7 +128,7 @@ public class SolrSuggester implements Accountable {
try {
((Closeable) lookup).close();
} catch (IOException e) {
- LOG.warn("Could not close the suggester lookup.", e);
+ log.warn("Could not close the suggester lookup.", e);
}
}
@@ -147,13 +147,13 @@ public class SolrSuggester implements Accountable {
if (!storeDir.exists()) {
storeDir.mkdirs();
} else if (getStoreFile().exists()) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("attempt reload of the stored lookup from file " + getStoreFile());
+ if (log.isDebugEnabled()) {
+ log.debug("attempt reload of the stored lookup from file " + getStoreFile());
}
try {
lookup.load(new FileInputStream(getStoreFile()));
} catch (IOException e) {
- LOG.warn("Loading stored lookup data failed, possibly not cached yet");
+ log.warn("Loading stored lookup data failed, possibly not cached yet");
}
}
}
@@ -162,19 +162,19 @@ public class SolrSuggester implements Accountable {
if (dictionaryImpl == null) {
dictionaryImpl = (sourceLocation == null) ? DictionaryFactory.DEFAULT_INDEX_BASED_DICT :
DictionaryFactory.DEFAULT_FILE_BASED_DICT;
- LOG.info("No " + DICTIONARY_IMPL + " parameter was provided falling back to " + dictionaryImpl);
+ log.info("No " + DICTIONARY_IMPL + " parameter was provided falling back to " + dictionaryImpl);
}
dictionaryFactory = core.getResourceLoader().newInstance(dictionaryImpl, DictionaryFactory.class);
dictionaryFactory.setParams(config);
- LOG.info("Dictionary loaded with params: " + config);
+ log.info("Dictionary loaded with params: " + config);
return name;
}
/** Build the underlying Lucene Suggester */
public void build(SolrCore core, SolrIndexSearcher searcher) throws IOException {
- LOG.info("SolrSuggester.build(" + name + ")");
+ log.info("SolrSuggester.build(" + name + ")");
dictionary = dictionaryFactory.create(core, searcher);
try {
@@ -188,16 +188,16 @@ public class SolrSuggester implements Accountable {
if (storeDir != null) {
File target = getStoreFile();
if(!lookup.store(new FileOutputStream(target))) {
- LOG.error("Store Lookup build failed");
+ log.error("Store Lookup build failed");
} else {
- LOG.info("Stored suggest data to: " + target.getAbsolutePath());
+ log.info("Stored suggest data to: " + target.getAbsolutePath());
}
}
}
/** Reloads the underlying Lucene Suggester */
public void reload(SolrCore core, SolrIndexSearcher searcher) throws IOException {
- LOG.info("SolrSuggester.reload(" + name + ")");
+ log.info("SolrSuggester.reload(" + name + ")");
if (dictionary == null && storeDir != null) {
File lookupFile = getStoreFile();
if (lookupFile.exists()) {
@@ -211,7 +211,7 @@ public class SolrSuggester implements Accountable {
IOUtils.closeWhileHandlingException(is);
}
} else {
- LOG.info("lookup file doesn't exist");
+ log.info("lookup file doesn't exist");
}
}
}
@@ -230,9 +230,9 @@ public class SolrSuggester implements Accountable {
/** Returns suggestions based on the {@link SuggesterOptions} passed */
public SuggesterResult getSuggestions(SuggesterOptions options) throws IOException {
- LOG.debug("getSuggestions: " + options.token);
+ log.debug("getSuggestions: " + options.token);
if (lookup == null) {
- LOG.info("Lookup is null - invoke suggest.build first");
+ log.info("Lookup is null - invoke suggest.build first");
return EMPTY_RESULT;
}
@@ -247,7 +247,7 @@ public class SolrSuggester implements Accountable {
if(suggestions == null){
// Context filtering not supported/configured by lookup
// Silently ignore filtering and serve a result by querying without context filtering
- LOG.debug("Context Filtering Query not supported by {}", lookup.getClass());
+ log.debug("Context Filtering Query not supported by {}", lookup.getClass());
suggestions = lookup.lookup(options.token, false, options.count);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java b/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java
index c0e7709..25e894d 100644
--- a/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java
+++ b/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java
@@ -54,7 +54,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class Suggester extends SolrSpellChecker {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
/** Location of the source data - either a path to a file, or null for the
* current IndexReader.
@@ -86,7 +86,7 @@ public class Suggester extends SolrSpellChecker {
@Override
public String init(NamedList config, SolrCore core) {
- LOG.info("init: " + config);
+ log.info("init: " + config);
String name = super.init(config, core);
threshold = config.get(THRESHOLD_TOKEN_FREQUENCY) == null ? 0.0f
: (Float)config.get(THRESHOLD_TOKEN_FREQUENCY);
@@ -112,7 +112,7 @@ public class Suggester extends SolrSpellChecker {
try {
((Closeable) lookup).close();
} catch (IOException e) {
- LOG.warn("Could not close the suggester lookup.", e);
+ log.warn("Could not close the suggester lookup.", e);
}
}
}
@@ -134,7 +134,7 @@ public class Suggester extends SolrSpellChecker {
try {
lookup.load(new FileInputStream(new File(storeDir, factory.storeFileName())));
} catch (IOException e) {
- LOG.warn("Loading stored lookup data failed", e);
+ log.warn("Loading stored lookup data failed", e);
}
}
}
@@ -144,7 +144,7 @@ public class Suggester extends SolrSpellChecker {
@Override
public void build(SolrCore core, SolrIndexSearcher searcher) throws IOException {
- LOG.info("build()");
+ log.info("build()");
if (sourceLocation == null) {
reader = searcher.getIndexReader();
dictionary = new HighFrequencyDictionary(reader, field, threshold);
@@ -154,7 +154,7 @@ public class Suggester extends SolrSpellChecker {
core.getResourceLoader().openResource(sourceLocation), StandardCharsets.UTF_8));
} catch (UnsupportedEncodingException e) {
// should not happen
- LOG.error("should not happen", e);
+ log.error("should not happen", e);
}
}
@@ -164,19 +164,19 @@ public class Suggester extends SolrSpellChecker {
if(!lookup.store(new FileOutputStream(target))) {
if (sourceLocation == null) {
assert reader != null && field != null;
- LOG.error("Store Lookup build from index on field: " + field + " failed reader has: " + reader.maxDoc() + " docs");
+ log.error("Store Lookup build from index on field: " + field + " failed reader has: " + reader.maxDoc() + " docs");
} else {
- LOG.error("Store Lookup build from sourceloaction: " + sourceLocation + " failed");
+ log.error("Store Lookup build from sourceloaction: " + sourceLocation + " failed");
}
} else {
- LOG.info("Stored suggest data to: " + target.getAbsolutePath());
+ log.info("Stored suggest data to: " + target.getAbsolutePath());
}
}
}
@Override
public void reload(SolrCore core, SolrIndexSearcher searcher) throws IOException {
- LOG.info("reload()");
+ log.info("reload()");
if (dictionary == null && storeDir != null) {
// this may be a firstSearcher event, try loading it
FileInputStream is = new FileInputStream(new File(storeDir, factory.storeFileName()));
@@ -187,7 +187,7 @@ public class Suggester extends SolrSpellChecker {
} finally {
IOUtils.closeWhileHandlingException(is);
}
- LOG.debug("load failed, need to build Lookup again");
+ log.debug("load failed, need to build Lookup again");
}
// loading was unsuccessful - build it again
build(core, searcher);
@@ -197,9 +197,9 @@ public class Suggester extends SolrSpellChecker {
@Override
public SpellingResult getSuggestions(SpellingOptions options) throws IOException {
- LOG.debug("getSuggestions: " + options.tokens);
+ log.debug("getSuggestions: " + options.tokens);
if (lookup == null) {
- LOG.info("Lookup is null - invoke spellchecker.build first");
+ log.info("Lookup is null - invoke spellchecker.build first");
return EMPTY_RESULT;
}
SpellingResult res = new SpellingResult();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8cde1277/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookupFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookupFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookupFactory.java
index 0e613f7..4d2e2e0 100644
--- a/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookupFactory.java
+++ b/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookupFactory.java
@@ -31,12 +31,12 @@ import org.slf4j.LoggerFactory;
* <b>Note:</b> This Suggester is not very RAM efficient.
*/
public class JaspellLookupFactory extends LookupFactory {
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String FILENAME = "jaspell.dat";
@Override
public Lookup create(NamedList params, SolrCore core) {
- LOG.info("init: " + params);
+ log.info("init: " + params);
return new JaspellLookup();
}