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/09/14 03:30:20 UTC
[03/43] lucene-solr:jira/http2: Merge remote-tracking branch
'upstream/master' into LUCENE-8343
Merge remote-tracking branch 'upstream/master' into LUCENE-8343
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/cef9a228
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/cef9a228
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/cef9a228
Branch: refs/heads/jira/http2
Commit: cef9a2283e30a297b3add8e73ee6dba9492dcc57
Parents: 17cfa63 6e88035
Author: Alessandro Benedetti <a....@sease.io>
Authored: Thu Jun 7 16:50:58 2018 +0100
Committer: Alessandro Benedetti <a....@sease.io>
Committed: Thu Jun 7 16:50:58 2018 +0100
----------------------------------------------------------------------
lucene/CHANGES.txt | 18 +
.../lucene/analysis/hunspell/Dictionary.java | 8 +-
.../miscellaneous/ConcatenateGraphFilter.java | 375 ++++++++++++++++++
.../ConcatenateGraphFilterFactory.java | 70 ++++
.../miscellaneous/FingerprintFilter.java | 4 +-
.../miscellaneous/WordDelimiterFilter.java | 7 +-
.../analysis/ngram/EdgeNGramFilterFactory.java | 10 +-
.../analysis/ngram/EdgeNGramTokenFilter.java | 85 ++--
.../analysis/ngram/NGramFilterFactory.java | 10 +-
.../lucene/analysis/ngram/NGramTokenFilter.java | 93 +++--
.../lucene/analysis/synonym/SynonymFilter.java | 4 +-
.../analysis/synonym/WordnetSynonymParser.java | 7 +-
...ache.lucene.analysis.util.TokenFilterFactory | 1 +
.../analysis/core/TestBugInSomething.java | 2 +-
.../lucene/analysis/core/TestRandomChains.java | 12 +-
.../TestConcatenateGraphFilter.java | 168 ++++++++
.../TestConcatenateGraphFilterFactory.java | 83 ++++
.../miscellaneous/TestFingerprintFilter.java | 9 +
.../ngram/EdgeNGramTokenFilterTest.java | 122 ++++--
.../analysis/ngram/NGramTokenFilterTest.java | 118 ++++--
.../analysis/ngram/NGramTokenizerTest.java | 3 +-
.../lucene/analysis/ngram/TestNGramFilters.java | 18 +-
.../classification/BM25NBClassifierTest.java | 2 +-
.../CachingNaiveBayesClassifierTest.java | 2 +-
.../SimpleNaiveBayesClassifierTest.java | 2 +-
.../codecs/blockterms/BlockTermsWriter.java | 10 +-
.../codecs/simpletext/SimpleTextBKDWriter.java | 10 +-
.../simpletext/SimpleTextFieldInfosFormat.java | 11 +-
.../simpletext/SimpleTextSegmentInfoFormat.java | 3 +-
.../CompressingStoredFieldsIndexReader.java | 25 +-
.../CompressingStoredFieldsWriter.java | 5 +-
.../CompressingTermVectorsWriter.java | 8 +-
.../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 | 6 +-
.../apache/lucene/index/SortingLeafReader.java | 6 +-
.../apache/lucene/search/BlendedTermQuery.java | 8 +-
.../apache/lucene/search/CachingCollector.java | 9 +-
.../org/apache/lucene/search/MaxScoreCache.java | 2 +-
.../org/apache/lucene/search/PhraseQuery.java | 2 +-
.../apache/lucene/search/PointInSetQuery.java | 2 +-
.../apache/lucene/search/PointRangeQuery.java | 5 +-
.../apache/lucene/search/spans/SpanWeight.java | 4 +-
.../java/org/apache/lucene/util/ArrayUtil.java | 200 +++++++++-
.../java/org/apache/lucene/util/BytesRef.java | 9 +-
.../org/apache/lucene/util/BytesRefBuilder.java | 4 +-
.../java/org/apache/lucene/util/CharsRef.java | 3 +-
.../org/apache/lucene/util/CharsRefBuilder.java | 4 +-
.../org/apache/lucene/util/DocIdSetBuilder.java | 5 +-
.../java/org/apache/lucene/util/IntsRef.java | 4 +-
.../java/org/apache/lucene/util/LongsRef.java | 4 +-
.../java/org/apache/lucene/util/PagedBytes.java | 7 +-
.../org/apache/lucene/util/QueryBuilder.java | 4 +-
.../org/apache/lucene/util/RoaringDocIdSet.java | 3 +-
.../apache/lucene/util/SparseFixedBitSet.java | 3 +-
.../org/apache/lucene/util/StringHelper.java | 2 +-
.../java/org/apache/lucene/util/Version.java | 7 +
.../automaton/DaciukMihovAutomatonBuilder.java | 4 +-
.../org/apache/lucene/util/bkd/BKDWriter.java | 10 +-
.../apache/lucene/util/bkd/HeapPointWriter.java | 7 +-
.../util/packed/DeltaPackedLongValues.java | 9 +-
.../lucene/util/packed/MonotonicLongValues.java | 11 +-
.../lucene/util/packed/PackedLongValues.java | 6 +-
.../lucene/analysis/TestCharacterUtils.java | 4 +-
.../AbstractTestCompressionMode.java | 11 +-
.../lucene/codecs/lucene50/TestForUtil.java | 14 +-
.../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 +++-
.../lucene/index/TestPerSegmentDeletes.java | 3 +-
.../apache/lucene/index/TestSegmentInfos.java | 6 +-
.../apache/lucene/index/TestSegmentMerger.java | 4 +-
.../TestSoftDeletesDirectoryReaderWrapper.java | 3 +-
.../org/apache/lucene/search/TestBoolean2.java | 4 +-
.../lucene/search/TestDoubleValuesSource.java | 3 +-
.../lucene/search/TestLongValuesSource.java | 3 +-
.../apache/lucene/search/TestPhraseQuery.java | 3 +-
.../TestSimpleExplanationsWithFillerDocs.java | 5 +-
.../apache/lucene/util/BaseSortTestCase.java | 4 +-
.../lucene/util/StressRamUsageEstimator.java | 5 +-
.../org/apache/lucene/util/TestArrayUtil.java | 87 ++++
.../org/apache/lucene/util/TestBytesRef.java | 8 +
.../org/apache/lucene/util/TestCharsRef.java | 8 +
.../org/apache/lucene/util/TestIntsRef.java | 8 +
.../apache/lucene/util/TestLSBRadixSorter.java | 4 +-
.../org/apache/lucene/util/TestLongsRef.java | 47 +++
.../apache/lucene/util/TestMSBRadixSorter.java | 4 +-
.../lucene/util/TestStringMSBRadixSorter.java | 4 +-
.../lucene/util/packed/TestPackedInts.java | 5 +-
.../lucene/expressions/TestExpressionSorts.java | 3 +-
.../search/highlight/TermVectorLeafReader.java | 2 +-
lucene/ivy-versions.properties | 2 +-
.../apache/lucene/index/memory/MemoryIndex.java | 4 +-
.../org/apache/lucene/index/IndexSplitter.java | 2 +-
.../lucene/search/intervals/IntervalQuery.java | 4 +-
.../lucene/document/TestHalfFloatPoint.java | 2 +-
.../spatial/prefix/tree/QuadPrefixTree.java | 4 +-
.../spatial/spatial4j/Geo3dShapeFactory.java | 10 +-
.../lucene/spatial/DistanceStrategyTest.java | 4 +-
.../lucene/spatial/spatial4j/Geo3dRptTest.java | 23 +-
.../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 ---------
.../suggest/document/TestContextQuery.java | 3 +-
.../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 +-
.../index/BaseStoredFieldsFormatTestCase.java | 2 +-
.../lucene/index/MismatchedLeafReader.java | 3 +-
.../lucene/index/RandomPostingsTester.java | 4 +-
.../lucene/search/BlockScoreQueryWrapper.java | 10 +-
.../lucene/store/MockDirectoryWrapper.java | 2 +-
.../util/automaton/AutomatonTestUtil.java | 4 +-
lucene/tools/forbiddenApis/lucene.txt | 24 ++
solr/CHANGES.txt | 100 ++++-
solr/NOTICE.txt | 14 +
.../field/AbstractAnalyticsFieldTest.java | 41 +-
.../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 | 30 +-
.../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 ++
.../transform/ChildDocTransformerFactory.java | 11 +-
.../apache/solr/schema/CurrencyFieldType.java | 18 +-
.../solr/search/CollapsingQParserPlugin.java | 2 +-
.../java/org/apache/solr/search/Insanity.java | 2 +-
.../org/apache/solr/search/QParserPlugin.java | 80 ++--
.../apache/solr/search/QueryWrapperFilter.java | 106 -----
.../apache/solr/search/TermsQParserPlugin.java | 22 +-
.../solr/security/PKIAuthenticationPlugin.java | 40 +-
.../apache/solr/security/PublicKeyHandler.java | 47 +++
.../org/apache/solr/servlet/HttpSolrCall.java | 4 +-
.../apache/solr/servlet/LoadAdminUiServlet.java | 6 +-
.../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 | 56 ++-
.../sim/TestClusterStateProvider.java | 6 +-
.../cloud/autoscaling/sim/TestLargeCluster.java | 118 ++++--
.../apache/solr/core/ResourceLoaderTest.java | 6 +-
.../tagger/EmbeddedSolrNoSerializeTest.java | 153 +++++++
.../handler/tagger/RandomizedTaggerTest.java | 150 +++++++
.../apache/solr/handler/tagger/Tagger2Test.java | 176 ++++++++
.../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 +++++++++++
.../solr/search/TestQueryWrapperFilter.java | 241 -----------
.../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 | 14 +-
solr/licenses/metrics-core-3.2.2.jar.sha1 | 1 -
solr/licenses/metrics-core-3.2.6.jar.sha1 | 1 +
solr/licenses/metrics-ganglia-3.2.2.jar.sha1 | 1 -
solr/licenses/metrics-ganglia-3.2.6.jar.sha1 | 1 +
solr/licenses/metrics-graphite-3.2.2.jar.sha1 | 1 -
solr/licenses/metrics-graphite-3.2.6.jar.sha1 | 1 +
solr/licenses/metrics-jetty9-3.2.2.jar.sha1 | 1 -
solr/licenses/metrics-jetty9-3.2.6.jar.sha1 | 1 +
solr/licenses/metrics-jvm-3.2.2.jar.sha1 | 1 -
solr/licenses/metrics-jvm-3.2.6.jar.sha1 | 1 +
solr/solr-ref-guide/src/_includes/head.html | 1 -
solr/solr-ref-guide/src/_layouts/page.html | 12 -
solr/solr-ref-guide/src/collections-api.adoc | 42 ++
solr/solr-ref-guide/src/css/comments.css | 160 --------
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 +
242 files changed, 6843 insertions(+), 2181 deletions(-)
----------------------------------------------------------------------