You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2016/02/05 00:08:10 UTC
[1/2] lucene-solr git commit: SOLR-8586: Fix forbidden APIS;
cleanup of imports
Repository: lucene-solr
Updated Branches:
refs/heads/master ec4c72310 -> 4569fd732
SOLR-8586: Fix forbidden APIS; cleanup of imports
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f6400e9c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f6400e9c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f6400e9c
Branch: refs/heads/master
Commit: f6400e9cbb1158178af0b6cb7901a784368ab589
Parents: 0f43705
Author: Uwe Schindler <us...@apache.org>
Authored: Fri Feb 5 00:07:23 2016 +0100
Committer: Uwe Schindler <us...@apache.org>
Committed: Fri Feb 5 00:07:23 2016 +0100
----------------------------------------------------------------------
.../apache/solr/update/IndexFingerprint.java | 40 ++------------------
1 file changed, 4 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f6400e9c/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java b/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java
index c73b57b..1ece092 100644
--- a/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java
+++ b/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java
@@ -19,55 +19,23 @@ package org.apache.solr.update;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
-import java.net.ConnectException;
-import java.net.SocketException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
import java.util.LinkedHashMap;
-import java.util.List;
import java.util.Map;
-import java.util.Set;
-import org.apache.http.NoHttpResponseException;
-import org.apache.http.client.HttpClient;
-import org.apache.http.conn.ConnectTimeoutException;
-import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
-import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.cloud.ZkController;
-import org.apache.solr.common.SolrException;
-import org.apache.solr.common.SolrInputDocument;
-import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.Hash;
import org.apache.solr.common.util.NamedList;
-import org.apache.solr.common.util.StrUtils;
import org.apache.solr.core.SolrCore;
-import org.apache.solr.handler.component.HttpShardHandlerFactory;
-import org.apache.solr.handler.component.ShardHandler;
-import org.apache.solr.handler.component.ShardHandlerFactory;
-import org.apache.solr.handler.component.ShardRequest;
-import org.apache.solr.handler.component.ShardResponse;
-import org.apache.solr.logging.MDCLoggingContext;
-import org.apache.solr.request.LocalSolrQueryRequest;
-import org.apache.solr.request.SolrQueryRequest;
-import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.SolrIndexSearcher;
-import org.apache.solr.update.processor.UpdateRequestProcessor;
-import org.apache.solr.update.processor.UpdateRequestProcessorChain;
+import org.apache.solr.util.RTimer;
import org.apache.solr.util.RefCounted;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.solr.update.processor.DistributedUpdateProcessor.DistribPhase.FROMLEADER;
-import static org.apache.solr.update.processor.DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM;
-
/** @lucene.internal */
public class IndexFingerprint {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -122,7 +90,7 @@ public class IndexFingerprint {
}
public static IndexFingerprint getFingerprint(SolrIndexSearcher searcher, long maxVersion) throws IOException {
- long start = System.currentTimeMillis();
+ RTimer timer = new RTimer();
SchemaField versionField = VersionInfo.getAndCheckVersionField(searcher.getSchema());
@@ -151,8 +119,8 @@ public class IndexFingerprint {
}
}
- long end = System.currentTimeMillis();
- log.info("IndexFingerprint millis:" + (end-start) + " result:" + f);
+ final double duration = timer.stop();
+ log.info("IndexFingerprint millis:" + duration + " result:" + f);
return f;
}
[2/2] lucene-solr git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/lucene-solr
Posted by us...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4569fd73
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4569fd73
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4569fd73
Branch: refs/heads/master
Commit: 4569fd732aa1406763ed94f5df830b324a584a6b
Parents: f6400e9 ec4c723
Author: Uwe Schindler <us...@apache.org>
Authored: Fri Feb 5 00:07:50 2016 +0100
Committer: Uwe Schindler <us...@apache.org>
Committed: Fri Feb 5 00:07:50 2016 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 2 +
.../apache/solr/update/HdfsTransactionLog.java | 22 +--
.../java/org/apache/solr/update/UpdateLog.java | 2 +-
.../TlogReplayBufferedWhileIndexingTest.java | 136 +++++++++++++++++++
...HdfsTlogReplayBufferedWhileIndexingTest.java | 63 +++++++++
5 files changed, 213 insertions(+), 12 deletions(-)
----------------------------------------------------------------------