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 2018/07/16 10:25:24 UTC
[5/8] lucene-solr:master: Merge remote-tracking branch
'source/master' into remove-constructor-wrapper-classes
Merge remote-tracking branch 'source/master' into remove-constructor-wrapper-classes
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/78079fc5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/78079fc5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/78079fc5
Branch: refs/heads/master
Commit: 78079fc5525359ef5c89ca42a115a51fbaaa123c
Parents: 6d33beb 124b5e0
Author: Michael Braun <n3...@gmail.com>
Authored: Tue Jun 5 18:48:55 2018 -0400
Committer: Michael Braun <n3...@gmail.com>
Committed: Tue Jun 5 18:48:55 2018 -0400
----------------------------------------------------------------------
lucene/CHANGES.txt | 12 +
.../miscellaneous/ConcatenateGraphFilter.java | 375 ++++++++++++++++++
.../ConcatenateGraphFilterFactory.java | 70 ++++
.../miscellaneous/FingerprintFilter.java | 4 +-
.../analysis/ngram/EdgeNGramFilterFactory.java | 10 +-
.../analysis/ngram/EdgeNGramTokenFilter.java | 85 ++--
.../analysis/ngram/NGramFilterFactory.java | 10 +-
.../lucene/analysis/ngram/NGramTokenFilter.java | 93 +++--
...ache.lucene.analysis.util.TokenFilterFactory | 1 +
.../analysis/core/TestBugInSomething.java | 2 +-
.../lucene/analysis/core/TestRandomChains.java | 7 +-
.../TestConcatenateGraphFilter.java | 168 ++++++++
.../TestConcatenateGraphFilterFactory.java | 83 ++++
.../miscellaneous/TestFingerprintFilter.java | 9 +
.../ngram/EdgeNGramTokenFilterTest.java | 122 ++++--
.../analysis/ngram/NGramTokenFilterTest.java | 118 ++++--
.../lucene/analysis/ngram/TestNGramFilters.java | 18 +-
.../classification/BM25NBClassifierTest.java | 2 +-
.../CachingNaiveBayesClassifierTest.java | 2 +-
.../SimpleNaiveBayesClassifierTest.java | 2 +-
.../simpletext/SimpleTextFieldInfosFormat.java | 11 +-
.../lucene50/Lucene50FieldInfosFormat.java | 2 +-
.../lucene60/Lucene60FieldInfosFormat.java | 8 +-
.../lucene/index/BinaryDocValuesWriter.java | 5 +
.../lucene/index/BufferedUpdatesStream.java | 2 +-
.../org/apache/lucene/index/CheckIndex.java | 27 +-
.../lucene/index/DefaultIndexingChain.java | 16 +
.../org/apache/lucene/index/DocConsumer.java | 9 +
.../apache/lucene/index/DocValuesWriter.java | 3 +
.../lucene/index/DocumentsWriterPerThread.java | 19 +-
.../java/org/apache/lucene/index/FieldInfo.java | 18 +-
.../org/apache/lucene/index/FieldInfos.java | 51 ++-
.../org/apache/lucene/index/IndexWriter.java | 47 ++-
.../org/apache/lucene/index/MultiFields.java | 6 +-
.../lucene/index/NumericDocValuesWriter.java | 5 +
.../apache/lucene/index/ParallelLeafReader.java | 7 +-
.../org/apache/lucene/index/PendingDeletes.java | 8 +-
.../apache/lucene/index/PendingSoftDeletes.java | 42 +-
.../org/apache/lucene/index/ReaderPool.java | 4 +-
.../apache/lucene/index/ReadersAndUpdates.java | 6 -
.../apache/lucene/index/SegmentCommitInfo.java | 34 +-
.../org/apache/lucene/index/SegmentInfos.java | 19 +-
.../org/apache/lucene/index/SegmentMerger.java | 1 +
.../apache/lucene/index/SegmentWriteState.java | 4 +-
.../SoftDeletesDirectoryReaderWrapper.java | 68 +++-
.../index/SoftDeletesRetentionMergePolicy.java | 2 +-
.../lucene/index/SortedDocValuesWriter.java | 5 +
.../index/SortedNumericDocValuesWriter.java | 5 +
.../lucene/index/SortedSetDocValuesWriter.java | 4 +
.../org/apache/lucene/index/TestAddIndexes.java | 46 +++
.../org/apache/lucene/index/TestCodecs.java | 4 +-
.../test/org/apache/lucene/index/TestDoc.java | 4 +-
.../apache/lucene/index/TestFieldsReader.java | 2 +-
.../apache/lucene/index/TestIndexWriter.java | 126 +++++-
.../index/TestIndexWriterThreadsToSegments.java | 2 +-
.../index/TestOneMergeWrappingMergePolicy.java | 2 +-
.../apache/lucene/index/TestPendingDeletes.java | 6 +-
.../lucene/index/TestPendingSoftDeletes.java | 75 +++-
.../apache/lucene/index/TestSegmentInfos.java | 6 +-
.../apache/lucene/index/TestSegmentMerger.java | 4 +-
.../TestSoftDeletesDirectoryReaderWrapper.java | 3 +-
.../search/highlight/TermVectorLeafReader.java | 2 +-
.../apache/lucene/index/memory/MemoryIndex.java | 4 +-
.../org/apache/lucene/index/IndexSplitter.java | 2 +-
.../analyzing/AnalyzingInfixSuggester.java | 2 +-
.../suggest/document/CompletionAnalyzer.java | 21 +-
.../suggest/document/CompletionQuery.java | 2 +-
.../suggest/document/CompletionTokenStream.java | 297 +-------------
.../search/suggest/document/ContextQuery.java | 5 +-
.../suggest/document/ContextSuggestField.java | 1 +
.../suggest/document/FuzzyCompletionQuery.java | 7 +-
.../suggest/document/NRTSuggesterBuilder.java | 3 +-
.../suggest/document/PrefixCompletionQuery.java | 5 +-
.../search/suggest/document/SuggestField.java | 3 +-
.../document/CompletionTokenStreamTest.java | 177 ---------
.../document/TestContextSuggestField.java | 13 +-
.../suggest/document/TestSuggestField.java | 29 +-
.../index/BaseFieldInfoFormatTestCase.java | 14 +-
.../index/BaseIndexFileFormatTestCase.java | 2 +-
.../index/BaseLiveDocsFormatTestCase.java | 4 +-
.../lucene/index/BaseMergePolicyTestCase.java | 2 +-
.../lucene/index/MismatchedLeafReader.java | 3 +-
.../lucene/index/RandomPostingsTester.java | 4 +-
.../lucene/store/MockDirectoryWrapper.java | 2 +-
solr/CHANGES.txt | 21 +-
solr/NOTICE.txt | 14 +
.../org/apache/solr/cloud/RecoveryStrategy.java | 29 +-
.../apache/solr/cloud/ReplicateFromLeader.java | 2 +-
.../cloud/autoscaling/ComputePlanAction.java | 8 +-
.../org/apache/solr/core/CoreContainer.java | 39 +-
.../src/java/org/apache/solr/core/SolrCore.java | 2 +-
.../apache/solr/core/SolrResourceLoader.java | 12 +-
.../solr/handler/admin/CollectionsHandler.java | 5 +-
.../solr/handler/component/ExpandComponent.java | 3 +-
.../solr/handler/tagger/OffsetCorrector.java | 178 +++++++++
.../solr/handler/tagger/TagClusterReducer.java | 103 +++++
.../org/apache/solr/handler/tagger/TagLL.java | 176 ++++++++
.../org/apache/solr/handler/tagger/Tagger.java | 230 +++++++++++
.../handler/tagger/TaggerRequestHandler.java | 397 +++++++++++++++++++
.../solr/handler/tagger/TaggingAttribute.java | 65 +++
.../handler/tagger/TaggingAttributeImpl.java | 79 ++++
.../solr/handler/tagger/TermPrefixCursor.java | 189 +++++++++
.../solr/handler/tagger/XmlOffsetCorrector.java | 113 ++++++
.../solr/handler/tagger/package-info.java | 27 ++
.../solr/search/CollapsingQParserPlugin.java | 2 +-
.../java/org/apache/solr/search/Insanity.java | 2 +-
.../org/apache/solr/search/QParserPlugin.java | 80 ++--
.../solr/security/PKIAuthenticationPlugin.java | 40 +-
.../apache/solr/security/PublicKeyHandler.java | 47 +++
.../org/apache/solr/servlet/HttpSolrCall.java | 4 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 43 +-
.../solr/uninverting/UninvertingReader.java | 2 +-
.../apache/solr/update/CdcrTransactionLog.java | 20 +-
.../org/apache/solr/update/CdcrUpdateLog.java | 3 -
.../apache/solr/update/HdfsTransactionLog.java | 18 +-
.../org/apache/solr/update/HdfsUpdateLog.java | 84 ++--
.../org/apache/solr/update/TransactionLog.java | 56 +--
.../java/org/apache/solr/update/UpdateLog.java | 255 ++++++------
.../solr/collection1/conf/schema-tagger.xml | 187 +++++++++
.../solr/collection1/conf/solrconfig-tagger.xml | 59 +++
.../apache/solr/cloud/RollingRestartTest.java | 10 +-
.../autoscaling/AutoScalingHandlerTest.java | 21 +
.../cloud/autoscaling/sim/SimCloudManager.java | 2 +-
.../sim/SimClusterStateProvider.java | 50 ++-
.../autoscaling/sim/SimNodeStateProvider.java | 128 +++---
.../autoscaling/sim/SimSolrCloudTestCase.java | 8 +-
.../sim/TestClusterStateProvider.java | 6 +-
.../cloud/autoscaling/sim/TestLargeCluster.java | 118 ++++--
.../apache/solr/core/ResourceLoaderTest.java | 8 +-
.../tagger/EmbeddedSolrNoSerializeTest.java | 153 +++++++
.../handler/tagger/RandomizedTaggerTest.java | 150 +++++++
.../apache/solr/handler/tagger/Tagger2Test.java | 175 ++++++++
.../apache/solr/handler/tagger/TaggerTest.java | 296 ++++++++++++++
.../solr/handler/tagger/TaggerTestCase.java | 251 ++++++++++++
.../handler/tagger/TaggingAttributeTest.java | 73 ++++
.../handler/tagger/WordLengthTaggingFilter.java | 110 +++++
.../tagger/WordLengthTaggingFilterFactory.java | 67 ++++
.../handler/tagger/XmlInterpolationTest.java | 224 +++++++++++
.../org/apache/solr/search/TestRecovery.java | 58 +--
.../apache/solr/search/TestRecoveryHdfs.java | 46 +--
.../solr/search/TestStandardQParsers.java | 10 +-
.../security/TestPKIAuthenticationPlugin.java | 7 +-
.../apache/solr/update/TransactionLogTest.java | 2 +-
solr/solr-ref-guide/src/collections-api.adoc | 42 ++
solr/solr-ref-guide/src/searching.adoc | 33 +-
solr/solr-ref-guide/src/the-tagger-handler.adoc | 265 +++++++++++++
.../client/solrj/cloud/autoscaling/Clause.java | 2 +-
.../client/solrj/cloud/autoscaling/Policy.java | 7 +-
.../solr/common/cloud/ClusterProperties.java | 18 +
.../apache/solr/common/cloud/ZkStateReader.java | 6 +
150 files changed, 6127 insertions(+), 1328 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/78079fc5/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
----------------------------------------------------------------------
diff --cc solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
index 3d212c5,785195a..dc06a6f
--- a/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
+++ b/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
@@@ -98,9 -99,10 +99,10 @@@ public class ResourceLoaderTest extend
assertAwareCompatibility(clazz, new JSONResponseWriter());
// Make sure it throws an error for invalid objects
+ //noinspection unchecked
invalid = new Object[] {
- new NGramFilterFactory(new HashMap<>()),
- "hello", 12.3f,
+ new NGramFilterFactory(map("minGramSize", "1", "maxGramSize", "2")),
- "hello", new Float( 12.3f ),
++ "hello", 12.3f ,
new KeywordTokenizerFactory(new HashMap<>())
};
for( Object obj : invalid ) {