You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/09/13 11:49:41 UTC
[1/2] lucene-solr:master: SOLR-9485:Indexfingerprint.fromObject()
returns wrong values if object passed was itself of type IndexFingerprint
Repository: lucene-solr
Updated Branches:
refs/heads/master 4db3e7b8a -> 652065e14
SOLR-9485:Indexfingerprint.fromObject() returns wrong values if object passed was itself of type IndexFingerprint
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/73d4b730
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/73d4b730
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/73d4b730
Branch: refs/heads/master
Commit: 73d4b730428de4d37c56a03d51244ce5c7bf0135
Parents: c56d832
Author: Noble Paul <no...@apache.org>
Authored: Tue Sep 13 17:19:12 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Sep 13 17:19:12 2016 +0530
----------------------------------------------------------------------
.../apache/solr/update/IndexFingerprint.java | 36 +++++++++++---------
1 file changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/73d4b730/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 b85b224..a299017 100644
--- a/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java
+++ b/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java
@@ -26,6 +26,7 @@ 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.solr.common.SolrException;
import org.apache.solr.common.util.Hash;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
@@ -168,16 +169,8 @@ public class IndexFingerprint {
return map;
}
- private static long getLong(Object o, String key, long def) {
- long v = def;
-
- Object oval = null;
- if (o instanceof Map) {
- oval = ((Map)o).get(key);
- } else if (o instanceof NamedList) {
- oval = ((NamedList)o).get(key);
- }
-
+ private static long getLong(Map m, String key, long def) {
+ Object oval = m.get(key);
return oval != null ? ((Number)oval).longValue() : def;
}
@@ -185,14 +178,23 @@ public class IndexFingerprint {
* Create an IndexFingerprint object from a deserialized generic object (Map or NamedList)
*/
public static IndexFingerprint fromObject(Object o) {
+ if (o instanceof IndexFingerprint) return (IndexFingerprint) o;
+ Map map = null;
+ if (o instanceof Map) {
+ map = (Map) o;
+ } else if (o instanceof NamedList) {
+ map = ((NamedList) o).asShallowMap();
+ } else {
+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Unknown type " + o);
+ }
IndexFingerprint f = new IndexFingerprint();
- f.maxVersionSpecified = getLong(o, "maxVersionSpecified", Long.MAX_VALUE);
- f.maxVersionEncountered = getLong(o, "maxVersionEncountered", -1);
- f.maxInHash = getLong(o, "maxInHash", -1);
- f.versionsHash = getLong(o, "versionsHash", -1);
- f.numVersions = getLong(o, "numVersions", -1);
- f.numDocs = getLong(o, "numDocs", -1);
- f.maxDoc = getLong(o, "maxDoc", -1);
+ f.maxVersionSpecified = getLong(map, "maxVersionSpecified", Long.MAX_VALUE);
+ f.maxVersionEncountered = getLong(map, "maxVersionEncountered", -1);
+ f.maxInHash = getLong(map, "maxInHash", -1);
+ f.versionsHash = getLong(map, "versionsHash", -1);
+ f.numVersions = getLong(map, "numVersions", -1);
+ f.numDocs = getLong(map, "numDocs", -1);
+ f.maxDoc = getLong(map, "maxDoc", -1);
return f;
}
[2/2] lucene-solr:master: Merge remote-tracking branch 'origin/master'
Posted by no...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/652065e1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/652065e1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/652065e1
Branch: refs/heads/master
Commit: 652065e14ebc7f1951c42e7d537fa74f70122bbd
Parents: 73d4b73 4db3e7b
Author: Noble Paul <no...@apache.org>
Authored: Tue Sep 13 17:19:33 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Sep 13 17:19:33 2016 +0530
----------------------------------------------------------------------
.../solr/test-framework/solr-test-framework.iml | 2 +
.../maven/solr/test-framework/pom.xml.template | 5 +
dev-tools/scripts/poll-mirrors.py | 41 +-
lucene/CHANGES.txt | 34 +-
.../lucene/analysis/core/LowerCaseFilter.java | 41 ++
.../analysis/core/LowerCaseFilterFactory.java | 1 -
.../apache/lucene/analysis/core/StopFilter.java | 47 ++
.../lucene/analysis/core/StopFilterFactory.java | 1 -
.../lucene/analysis/minhash/MinHashFilter.java | 17 +-
.../lucene/analysis/standard/package.html | 4 +
.../core/TestAllAnalyzersHaveFactories.java | 4 +-
.../lucene/analysis/core/TestRandomChains.java | 5 +-
.../index/TestBackwardsCompatibility.java | 4 +-
.../lucene/index/unsupported.5.5.3-cfs.zip | Bin 0 -> 13724 bytes
.../lucene/index/unsupported.5.5.3-nocfs.zip | Bin 0 -> 13725 bytes
.../apache/lucene/analysis/LowerCaseFilter.java | 2 +-
.../org/apache/lucene/analysis/StopFilter.java | 2 +-
.../lucene/codecs/MultiLevelSkipListReader.java | 9 +-
.../org/apache/lucene/index/LogMergePolicy.java | 6 +-
.../org/apache/lucene/search/FuzzyQuery.java | 2 +-
.../apache/lucene/search/FuzzyTermsEnum.java | 379 +++++++--------
.../org/apache/lucene/index/Test2BDocs.java | 135 +++++
.../org/apache/lucene/search/TestBoolean2.java | 41 +-
.../apache/lucene/search/TestFuzzyQuery.java | 215 ++++++++
.../lucene/search/TestSearcherManager.java | 6 +-
.../highlight/WeightedSpanTermExtractor.java | 26 +-
.../search/highlight/HighlighterTest.java | 30 +-
.../xml/builders/FuzzyLikeThisQueryBuilder.java | 4 +-
.../sandbox/queries/FuzzyLikeThisQuery.java | 312 ++++++------
.../lucene/sandbox/queries/SlowFuzzyQuery.java | 201 --------
.../sandbox/queries/SlowFuzzyTermsEnum.java | 263 ----------
.../sandbox/queries/FuzzyLikeThisQueryTest.java | 14 +-
.../sandbox/queries/TestSlowFuzzyQuery.java | 487 -------------------
.../lucene/search/spell/DirectSpellChecker.java | 20 +-
solr/CHANGES.txt | 58 ++-
.../handler/extraction/XLSXResponseWriter.java | 414 ++++++++++++++++
.../extraction/solr/collection1/conf/schema.xml | 2 +
.../extraction/TestXLSXResponseWriter.java | 257 ++++++++++
.../solr/hadoop/TreeMergeOutputFormat.java | 10 +-
.../client/solrj/embedded/JettySolrRunner.java | 18 +-
.../org/apache/solr/cloud/DeleteShardCmd.java | 2 +-
.../org/apache/solr/cloud/ElectionContext.java | 18 +-
.../org/apache/solr/cloud/LeaderElector.java | 4 +-
.../solr/cloud/OverseerTaskProcessor.java | 4 +-
.../org/apache/solr/cloud/RecoveryStrategy.java | 2 +-
.../org/apache/solr/cloud/SplitShardCmd.java | 36 ++
.../solr/cloud/overseer/CollectionMutator.java | 8 +
.../solr/cloud/overseer/ReplicaMutator.java | 59 ++-
.../solr/cloud/overseer/SliceMutator.java | 5 +-
.../src/java/org/apache/solr/core/SolrCore.java | 8 +-
.../org/apache/solr/handler/IndexFetcher.java | 6 +-
.../solr/handler/component/FacetComponent.java | 31 +-
.../org/apache/solr/request/SimpleFacets.java | 71 ++-
.../analysis/ManagedStopFilterFactory.java | 2 +-
.../java/org/apache/solr/schema/BoolField.java | 10 +-
.../solr/search/CollapsingQParserPlugin.java | 18 +-
.../apache/solr/search/SolrIndexSearcher.java | 5 +
.../solr/update/DirectUpdateHandler2.java | 20 +-
.../apache/solr/update/SolrIndexSplitter.java | 11 +-
.../org/apache/solr/update/SolrIndexWriter.java | 16 +-
.../org/apache/solr/TestDistributedSearch.java | 4 +-
.../org/apache/solr/TestRandomFaceting.java | 261 ++++++++--
.../org/apache/solr/cloud/ShardSplitTest.java | 367 ++++++++++++++
.../solr/cloud/TestMiniSolrCloudCluster.java | 67 ---
.../cloud/TestMiniSolrCloudClusterBase.java | 207 --------
.../cloud/TestMiniSolrCloudClusterKerberos.java | 14 -
.../TestSolrCloudWithSecureImpersonation.java | 25 +-
.../apache/solr/core/TestArbitraryIndexDir.java | 113 -----
.../DocumentAnalysisRequestHandlerTest.java | 8 +-
.../FieldAnalysisRequestHandlerTest.java | 10 +-
.../DistributedFacetExistsSmallTest.java | 236 +++++++++
.../apache/solr/request/SimpleFacetsTest.java | 286 ++++++++++-
.../solr/search/TestCollapseQParserPlugin.java | 17 +
.../solr/security/BasicAuthIntegrationTest.java | 77 ++-
.../example-DIH/solr/db/conf/solrconfig.xml | 18 +-
.../example-DIH/solr/mail/conf/solrconfig.xml | 18 +-
.../example-DIH/solr/rss/conf/solrconfig.xml | 18 +-
.../example-DIH/solr/solr/conf/solrconfig.xml | 18 +-
.../example-DIH/solr/tika/conf/solrconfig.xml | 18 +-
.../org/apache/solr/common/cloud/Slice.java | 11 +-
.../apache/solr/common/cloud/SolrZkClient.java | 10 +-
.../apache/solr/common/params/FacetParams.java | 8 +
.../solr/client/solrj/SolrExampleTests.java | 7 +-
.../solr/common/util/TestJavaBinCodec.java | 104 ++--
solr/test-framework/build.xml | 3 -
.../apache/solr/cloud/MiniSolrCloudCluster.java | 2 +-
.../apache/solr/cloud/SolrCloudTestCase.java | 5 +
.../src/test-files/log4j.properties | 11 +
.../apache/solr/cloud/JettySolrRunnerTest.java | 66 +++
.../solr/cloud/MiniSolrCloudClusterTest.java | 105 ++++
90 files changed, 3453 insertions(+), 2116 deletions(-)
----------------------------------------------------------------------