You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/05/15 20:04:56 UTC
[39/39] lucene-solr:jira/solr-11779: Merge branch 'master' into
jira/solr-11779
Merge branch 'master' into jira/solr-11779
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/fc486f20
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/fc486f20
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/fc486f20
Branch: refs/heads/jira/solr-11779
Commit: fc486f208031c236f20dfabd63b92e954f1c06f2
Parents: 2841f44 f959777
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue May 15 22:04:04 2018 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue May 15 22:04:04 2018 +0200
----------------------------------------------------------------------
dev-tools/doap/lucene.rdf | 7 +
dev-tools/doap/solr.rdf | 7 +
lucene/CHANGES.txt | 39 +-
lucene/MIGRATE.txt | 4 +
.../lucene/analysis/custom/CustomAnalyzer.java | 202 +++-
.../miscellaneous/ConditionalTokenFilter.java | 151 +++
.../ConditionalTokenFilterFactory.java | 85 ++
.../miscellaneous/TermExclusionFilter.java | 52 +
.../TermExclusionFilterFactory.java | 58 +
...ache.lucene.analysis.util.TokenFilterFactory | 1 +
.../lucene/analysis/core/TestRandomChains.java | 55 +-
.../analysis/custom/TestCustomAnalyzer.java | 44 +
.../TestConditionalTokenFilter.java | 233 ++++
.../miscellaneous/TestTermExclusionFilter.java | 48 +
.../index/TestBackwardsCompatibility.java | 7 +-
.../org/apache/lucene/index/index.7.3.1-cfs.zip | Bin 0 -> 15652 bytes
.../apache/lucene/index/index.7.3.1-nocfs.zip | Bin 0 -> 15640 bytes
.../org/apache/lucene/index/sorted.7.3.1.zip | Bin 0 -> 80784 bytes
.../codecs/memory/MemoryDocValuesConsumer.java | 539 ---------
.../codecs/memory/MemoryDocValuesFormat.java | 72 --
.../codecs/memory/MemoryDocValuesProducer.java | 877 ---------------
.../codecs/memory/MemoryPostingsFormat.java | 1037 ------------------
.../simpletext/SimpleTextLiveDocsFormat.java | 43 +-
.../org.apache.lucene.codecs.DocValuesFormat | 1 -
.../org.apache.lucene.codecs.PostingsFormat | 2 +-
.../memory/TestMemoryDocValuesFormat.java | 39 -
.../codecs/memory/TestMemoryPostingsFormat.java | 35 -
.../TestSimpleTextLiveDocsFormat.java | 29 +
.../apache/lucene/codecs/LiveDocsFormat.java | 9 +-
.../codecs/lucene50/Lucene50LiveDocsFormat.java | 40 +-
.../lucene/document/NumericDocValuesField.java | 12 +-
.../lucene/index/DefaultIndexingChain.java | 3 +
.../lucene/index/DocValuesFieldUpdates.java | 45 +-
.../apache/lucene/index/DocValuesUpdate.java | 46 +-
.../lucene/index/DocumentsWriterPerThread.java | 18 +-
.../lucene/index/FreqProxTermsWriter.java | 4 +-
.../lucene/index/FrozenBufferedUpdates.java | 21 +-
.../org/apache/lucene/index/IndexWriter.java | 42 +-
.../org/apache/lucene/index/PendingDeletes.java | 63 +-
.../apache/lucene/index/PendingSoftDeletes.java | 33 +-
.../apache/lucene/index/ReadersAndUpdates.java | 64 +-
.../apache/lucene/index/SegmentWriteState.java | 6 +-
.../lucene/search/ExactPhraseMatcher.java | 152 +++
.../apache/lucene/search/ExactPhraseScorer.java | 191 ----
.../apache/lucene/search/MultiPhraseQuery.java | 319 +++---
.../org/apache/lucene/search/PhraseMatcher.java | 91 ++
.../org/apache/lucene/search/PhraseQuery.java | 213 ++--
.../org/apache/lucene/search/PhraseScorer.java | 101 ++
.../org/apache/lucene/search/PhraseWeight.java | 124 +++
.../lucene/search/SloppyPhraseMatcher.java | 596 ++++++++++
.../lucene/search/SloppyPhraseScorer.java | 591 ----------
.../src/java/org/apache/lucene/util/BitSet.java | 5 +-
.../org/apache/lucene/util/FixedBitSet.java | 21 +-
.../org/apache/lucene/util/MutableBits.java | 31 -
.../java/org/apache/lucene/util/Version.java | 7 +
.../org/apache/lucene/TestExternalCodecs.java | 5 +-
.../lucene50/TestLucene50LiveDocsFormat.java | 30 +
.../perfield/TestPerFieldDocValuesFormat.java | 2 +-
.../perfield/TestPerFieldPostingsFormat2.java | 24 +-
.../lucene/index/Test2BBinaryDocValues.java | 2 +-
.../org/apache/lucene/index/Test2BDocs.java | 2 +-
.../lucene/index/Test2BNumericDocValues.java | 2 +-
.../org/apache/lucene/index/Test2BPoints.java | 2 +-
.../apache/lucene/index/Test2BPositions.java | 2 +-
.../org/apache/lucene/index/Test2BPostings.java | 2 +-
.../lucene/index/Test2BPostingsBytes.java | 2 +-
.../index/Test2BSortedDocValuesFixedSorted.java | 2 +-
.../lucene/index/Test2BSortedDocValuesOrds.java | 2 +-
.../org/apache/lucene/index/Test2BTerms.java | 2 +-
.../org/apache/lucene/index/TestAddIndexes.java | 7 +-
.../apache/lucene/index/TestBagOfPositions.java | 2 +-
.../apache/lucene/index/TestBagOfPostings.java | 2 +-
.../org/apache/lucene/index/TestDocValues.java | 17 +
.../lucene/index/TestDuelingCodecsAtNight.java | 2 +-
.../lucene/index/TestIndexWriterCommit.java | 1 -
.../lucene/index/TestIndexWriterDelete.java | 1 -
.../lucene/index/TestIndexWriterMaxDocs.java | 2 +-
.../lucene/index/TestIndexWriterOnDiskFull.java | 1 -
.../lucene/index/TestLazyProxSkipping.java | 1 -
.../apache/lucene/index/TestLongPostings.java | 2 +-
.../lucene/index/TestMixedDocValuesUpdates.java | 116 +-
.../org/apache/lucene/index/TestNRTThreads.java | 2 +-
.../test/org/apache/lucene/index/TestNorms.java | 5 +-
.../apache/lucene/index/TestPendingDeletes.java | 10 +-
.../lucene/index/TestPendingSoftDeletes.java | 82 +-
.../apache/lucene/index/TestRollingUpdates.java | 6 +-
.../TestSoftDeletesRetentionMergePolicy.java | 89 ++
.../org/apache/lucene/index/TestTermsEnum.java | 2 +-
.../apache/lucene/search/TestBooleanQuery.java | 2 +-
.../apache/lucene/search/TestBooleanScorer.java | 2 +-
.../TestControlledRealTimeReopenThread.java | 2 +-
.../lucene/search/TestMatchesIterator.java | 72 +-
.../lucene/search/TestSearchWithThreads.java | 2 +-
.../lucene/search/TestSearcherManager.java | 2 +-
.../lucene/search/TestShardSearching.java | 2 +-
.../lucene/search/TestSloppyPhraseQuery.java | 13 +-
.../lucene/search/TestSortedSetSelector.java | 2 +-
.../org/apache/lucene/util/TestFixedBitSet.java | 32 +
.../org/apache/lucene/util/fst/TestFSTs.java | 2 +-
lucene/ivy-versions.properties | 5 +-
...jetty-continuation-9.4.10.v20180503.jar.sha1 | 1 +
.../jetty-continuation-9.4.8.v20171121.jar.sha1 | 1 -
.../jetty-http-9.4.10.v20180503.jar.sha1 | 1 +
.../jetty-http-9.4.8.v20171121.jar.sha1 | 1 -
.../licenses/jetty-io-9.4.10.v20180503.jar.sha1 | 1 +
.../licenses/jetty-io-9.4.8.v20171121.jar.sha1 | 1 -
.../jetty-server-9.4.10.v20180503.jar.sha1 | 1 +
.../jetty-server-9.4.8.v20171121.jar.sha1 | 1 -
.../jetty-servlet-9.4.10.v20180503.jar.sha1 | 1 +
.../jetty-servlet-9.4.8.v20171121.jar.sha1 | 1 -
.../jetty-util-9.4.10.v20180503.jar.sha1 | 1 +
.../jetty-util-9.4.8.v20171121.jar.sha1 | 1 -
.../randomizedtesting-runner-2.5.3.jar.sha1 | 1 -
.../randomizedtesting-runner-2.6.0.jar.sha1 | 1 +
.../search/TestInetAddressRangeQueries.java | 2 +-
.../complexPhrase/ComplexPhraseQueryParser.java | 7 +
.../complexPhrase/TestComplexPhraseQuery.java | 2 +
.../lucene/replicator/nrt/SimpleServer.java | 2 +-
.../replicator/nrt/TestNRTReplication.java | 2 +-
.../nrt/TestStressNRTReplication.java | 2 +-
.../analysis/BaseTokenStreamTestCase.java | 4 +-
.../asserting/AssertingLiveDocsFormat.java | 61 +-
.../codecs/cranky/CrankyLiveDocsFormat.java | 13 +-
.../apache/lucene/geo/BaseGeoPointTestCase.java | 1 -
.../index/BaseLiveDocsFormatTestCase.java | 139 +++
.../org/apache/lucene/index/RandomCodec.java | 7 +-
.../java/org/apache/lucene/util/TestUtil.java | 2 +-
.../dependencies/InterpolatedProperties.java | 6 +-
solr/CHANGES.txt | 62 +-
solr/bin/solr | 4 +-
.../java/org/apache/solr/api/V2HttpCall.java | 45 +-
.../autoscaling/OverseerTriggerThread.java | 12 +-
.../solr/handler/admin/CollectionsHandler.java | 2 +
.../solr/response/GeoJSONResponseWriter.java | 11 +-
.../solr/response/JSONResponseWriter.java | 12 +-
.../solr/search/facet/FacetFieldProcessor.java | 3 +-
.../facet/FacetFieldProcessorByArray.java | 4 +-
.../apache/solr/search/facet/FacetModule.java | 4 +-
.../org/apache/solr/servlet/HttpSolrCall.java | 4 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 11 +-
.../solr/collection1/conf/schema_codec.xml | 5 +-
.../solr/collection1/conf/schema_latest.xml | 2 +-
.../apache/solr/cloud/AliasIntegrationTest.java | 52 +-
.../solr/cloud/CreateRoutedAliasTest.java | 33 +-
.../org/apache/solr/core/TestCodecSupport.java | 9 +-
.../search/facet/TestJsonFacetRefinement.java | 496 +++++----
.../solr/search/facet/TestJsonFacets.java | 5 +
.../function/TestMinMaxOnMultiValuedField.java | 2 +-
.../function/TestSortByMinMaxFunction.java | 2 +-
.../TestDocTermOrdsUninvertLimit.java | 1 -
.../uninverting/TestFieldCacheVsDocValues.java | 111 +-
...jetty-continuation-9.4.10.v20180503.jar.sha1 | 1 +
.../jetty-continuation-9.4.8.v20171121.jar.sha1 | 1 -
.../jetty-deploy-9.4.10.v20180503.jar.sha1 | 1 +
.../jetty-deploy-9.4.8.v20171121.jar.sha1 | 1 -
.../jetty-http-9.4.10.v20180503.jar.sha1 | 1 +
.../jetty-http-9.4.8.v20171121.jar.sha1 | 1 -
.../licenses/jetty-io-9.4.10.v20180503.jar.sha1 | 1 +
solr/licenses/jetty-io-9.4.8.v20171121.jar.sha1 | 1 -
.../jetty-jmx-9.4.10.v20180503.jar.sha1 | 1 +
.../licenses/jetty-jmx-9.4.8.v20171121.jar.sha1 | 1 -
.../jetty-rewrite-9.4.10.v20180503.jar.sha1 | 1 +
.../jetty-rewrite-9.4.8.v20171121.jar.sha1 | 1 -
.../jetty-security-9.4.10.v20180503.jar.sha1 | 1 +
.../jetty-security-9.4.8.v20171121.jar.sha1 | 1 -
.../jetty-server-9.4.10.v20180503.jar.sha1 | 1 +
.../jetty-server-9.4.8.v20171121.jar.sha1 | 1 -
.../jetty-servlet-9.4.10.v20180503.jar.sha1 | 1 +
.../jetty-servlet-9.4.8.v20171121.jar.sha1 | 1 -
.../jetty-servlets-9.4.10.v20180503.jar.sha1 | 1 +
.../jetty-servlets-9.4.8.v20171121.jar.sha1 | 1 -
.../jetty-util-9.4.10.v20180503.jar.sha1 | 1 +
.../jetty-util-9.4.8.v20171121.jar.sha1 | 1 -
.../jetty-webapp-9.4.10.v20180503.jar.sha1 | 1 +
.../jetty-webapp-9.4.8.v20171121.jar.sha1 | 1 -
.../jetty-xml-9.4.10.v20180503.jar.sha1 | 1 +
.../licenses/jetty-xml-9.4.8.v20171121.jar.sha1 | 1 -
solr/licenses/junit4-ant-2.5.3.jar.sha1 | 1 -
solr/licenses/junit4-ant-2.6.0.jar.sha1 | 1 +
.../randomizedtesting-runner-2.5.3.jar.sha1 | 1 -
.../randomizedtesting-runner-2.6.0.jar.sha1 | 1 +
solr/licenses/start.jar.sha1 | 2 +-
solr/server/ivy.xml | 7 +-
solr/solr-ref-guide/src/dsp.adoc | 719 ++++++++++++
.../hidden-signal-autocorrelation.png | Bin 0 -> 258831 bytes
.../math-expressions/hidden-signal-fft.png | Bin 0 -> 215981 bytes
.../images/math-expressions/hidden-signal.png | Bin 0 -> 319100 bytes
.../math-expressions/noise-autocorrelation.png | Bin 0 -> 204511 bytes
.../src/images/math-expressions/noise-fft.png | Bin 0 -> 319551 bytes
.../src/images/math-expressions/noise.png | Bin 0 -> 375565 bytes
.../math-expressions/signal-autocorrelation.png | Bin 0 -> 322164 bytes
.../src/images/math-expressions/signal-fft.png | Bin 0 -> 140111 bytes
.../src/images/math-expressions/signal.png | Bin 0 -> 365018 bytes
.../src/kerberos-authentication-plugin.adoc | 2 +-
solr/solr-ref-guide/src/math-expressions.adoc | 4 +-
.../src/transforming-result-documents.adoc | 1 +
.../apache/solr/common/cloud/ZkStateReader.java | 11 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 5 +-
198 files changed, 4436 insertions(+), 4585 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc486f20/lucene/ivy-versions.properties
----------------------------------------------------------------------