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/08 21:15:35 UTC

[49/50] [abbrv] 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/c3337599
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c3337599
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c3337599

Branch: refs/heads/jira/solr-11779
Commit: c33375991b89867be3b256c4e402243581ba60e2
Parents: d778367 81f6112
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Mon May 7 21:02:35 2018 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Mon May 7 21:02:35 2018 +0200

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |  23 +-
 .../miscellaneous/WordDelimiterFilter.java      |  13 +-
 .../miscellaneous/WordDelimiterGraphFilter.java |  18 +-
 .../miscellaneous/TestWordDelimiterFilter.java  |  43 +-
 .../TestWordDelimiterGraphFilter.java           |  32 +
 ...ache.lucene.analysis.util.TokenFilterFactory |   1 +
 .../codecs/blockterms/BlockTermsReader.java     |   7 +-
 .../blocktreeords/OrdsIntersectTermsEnum.java   |   5 +-
 .../blocktreeords/OrdsSegmentTermsEnum.java     |   5 +-
 .../bloom/BloomFilteringPostingsFormat.java     |   7 +-
 .../codecs/memory/DirectPostingsFormat.java     |   9 +-
 .../lucene/codecs/memory/FSTOrdTermsReader.java |   7 +-
 .../lucene/codecs/memory/FSTTermsReader.java    |   5 +-
 .../codecs/memory/MemoryDocValuesProducer.java  |   7 +-
 .../codecs/memory/MemoryPostingsFormat.java     |   7 +-
 .../simpletext/SimpleTextFieldsReader.java      |   5 +-
 .../simpletext/SimpleTextTermVectorsReader.java |   7 +-
 .../codecs/CompetitiveFreqNormAccumulator.java  | 163 ----
 .../codecs/CompetitiveImpactAccumulator.java    | 127 ++++
 .../lucene/codecs/PostingsReaderBase.java       |   3 +-
 .../codecs/blocktree/IntersectTermsEnum.java    |   5 +-
 .../codecs/blocktree/SegmentTermsEnum.java      |   5 +-
 .../CompressingTermVectorsReader.java           |   6 +-
 .../codecs/lucene50/Lucene50PostingsReader.java |  39 +-
 .../codecs/lucene50/Lucene50PostingsWriter.java |   4 +-
 .../lucene50/Lucene50ScoreSkipReader.java       | 141 ++--
 .../codecs/lucene50/Lucene50SkipReader.java     |   3 +-
 .../codecs/lucene50/Lucene50SkipWriter.java     |  36 +-
 .../lucene70/Lucene70DocValuesProducer.java     |   3 +-
 .../apache/lucene/document/FeatureQuery.java    |   8 +-
 .../index/BinaryDocValuesFieldUpdates.java      | 174 ++---
 .../apache/lucene/index/BufferedUpdates.java    |  62 +-
 .../org/apache/lucene/index/CheckIndex.java     | 186 +++--
 .../lucene/index/DocValuesFieldUpdates.java     | 295 +++++--
 .../apache/lucene/index/DocValuesUpdate.java    |  92 ++-
 .../apache/lucene/index/DocumentsWriter.java    |  41 +-
 .../index/DocumentsWriterDeleteQueue.java       |   7 +-
 .../lucene/index/DocumentsWriterFlushQueue.java | 180 ++---
 .../lucene/index/DocumentsWriterPerThread.java  |   5 +-
 .../apache/lucene/index/FilterLeafReader.java   |   5 +-
 .../apache/lucene/index/FilteredTermsEnum.java  |   5 +-
 .../org/apache/lucene/index/FreqProxFields.java |   3 +-
 .../lucene/index/FrozenBufferedUpdates.java     | 147 ++--
 .../java/org/apache/lucene/index/Impact.java    |  61 ++
 .../java/org/apache/lucene/index/Impacts.java   |  54 ++
 .../org/apache/lucene/index/ImpactsEnum.java    |  39 +-
 .../org/apache/lucene/index/IndexWriter.java    | 400 ++++++----
 .../org/apache/lucene/index/MergePolicy.java    |   2 +
 .../org/apache/lucene/index/MultiTermsEnum.java |   5 +-
 .../index/NumericDocValuesFieldUpdates.java     | 155 +---
 .../org/apache/lucene/index/PendingDeletes.java |  18 +-
 .../apache/lucene/index/PendingSoftDeletes.java |  43 +-
 .../apache/lucene/index/ReadersAndUpdates.java  | 362 ++++-----
 .../apache/lucene/index/SlowImpactsEnum.java    |  39 +-
 .../lucene/index/SortedDocValuesTermsEnum.java  |   3 +-
 .../index/SortedSetDocValuesTermsEnum.java      |   3 +-
 .../java/org/apache/lucene/index/TermsEnum.java |   7 +-
 .../search/BlockMaxConjunctionScorer.java       |   3 +
 .../lucene/search/DisjunctionMaxScorer.java     |   1 +
 .../lucene/search/DisjunctionSumScorer.java     |   1 +
 .../apache/lucene/search/FuzzyTermsEnum.java    |   5 +-
 .../org/apache/lucene/search/MaxScoreCache.java | 138 ++++
 .../org/apache/lucene/search/ReqExclScorer.java |   5 +
 .../apache/lucene/search/ReqOptSumScorer.java   |   7 +
 .../java/org/apache/lucene/search/Scorer.java   |   4 +-
 .../org/apache/lucene/search/TermScorer.java    |  40 +-
 .../org/apache/lucene/search/WANDScorer.java    |   1 +
 .../java/org/apache/lucene/store/Directory.java |   7 +
 .../org/apache/lucene/store/FSDirectory.java    |  16 +-
 .../lucene/store/FileSwitchDirectory.java       |   5 +
 .../apache/lucene/store/FilterDirectory.java    |   4 +
 .../TestCompetitiveFreqNormAccumulator.java     |  44 +-
 .../lucene50/TestBlockPostingsFormat.java       |  57 +-
 .../org/apache/lucene/index/TestCodecs.java     |   3 +-
 .../lucene/index/TestDocValuesFieldUpdates.java |  72 ++
 .../lucene/index/TestFilterLeafReader.java      |  22 +
 .../TestIndexWriterOutOfFileDescriptors.java    |   5 +
 .../lucene/index/TestMixedDocValuesUpdates.java | 154 +++-
 .../lucene/index/TestPendingSoftDeletes.java    |  62 +-
 .../TestSoftDeletesRetentionMergePolicy.java    | 102 ++-
 .../lucene/search/TestSearcherManager.java      |   3 +-
 .../lucene/store/TestFilterDirectory.java       |   2 +-
 .../facet/taxonomy/SearcherTaxonomyManager.java |  12 +-
 .../taxonomy/TestSearcherTaxonomyManager.java   |  26 +
 .../directory/TestDirectoryTaxonomyWriter.java  |  61 +-
 .../search/uhighlight/FieldOffsetStrategy.java  |   2 +-
 lucene/ivy-versions.properties                  |   2 +-
 .../apache/lucene/index/memory/MemoryIndex.java |   5 +-
 .../lucene/replicator/nrt/ReplicaNode.java      |   5 +-
 .../idversion/IDVersionPostingsReader.java      |   5 +-
 .../idversion/IDVersionSegmentTermsEnum.java    |   5 +-
 .../search/intervals/IntervalFunction.java      |   4 +-
 .../search/intervals/TestIntervalQuery.java     |  12 +
 .../lucene/search/intervals/TestIntervals.java  |  25 +-
 .../spatial3d/geom/GeoComplexPolygon.java       | 762 +++++++++++++------
 .../lucene/spatial3d/geom/GeoPolygonTest.java   | 146 +++-
 .../spatial3d/geom/RandomGeoPolygonTest.java    | 249 +++---
 .../codecs/ramonly/RAMOnlyPostingsFormat.java   |   5 +-
 .../lucene/index/AssertingLeafReader.java       |  55 +-
 .../lucene/index/RandomPostingsTester.java      | 241 +++---
 .../apache/lucene/search/AssertingScorer.java   |   5 +-
 .../org/apache/lucene/search/CheckHits.java     |   2 +-
 .../lucene/store/BaseLockFactoryTestCase.java   |  18 +-
 .../dependencies/InterpolatedProperties.java    | 127 +++-
 solr/CHANGES.txt                                |  37 +
 solr/bin-test/test_auth.sh                      |  40 +
 solr/bin-test/utils/assert.sh                   |  30 +-
 .../prometheus-exporter/bin/solr-exporter.cmd   |   8 +-
 .../org/apache/solr/cloud/SyncStrategy.java     |   2 +-
 .../api/collections/DeleteCollectionCmd.java    |  30 +-
 .../OverseerCollectionMessageHandler.java       |   9 +-
 .../org/apache/solr/core/BlobRepository.java    |  16 +-
 .../java/org/apache/solr/core/SolrConfig.java   |  45 +-
 .../org/apache/solr/handler/IndexFetcher.java   |  42 +-
 .../apache/solr/handler/ReplicationHandler.java |   6 +-
 .../admin/AutoscalingHistoryHandler.java        |   2 +-
 .../solr/handler/admin/CollectionsHandler.java  |   4 +-
 .../solr/handler/admin/CoreAdminHandler.java    |   6 +
 .../apache/solr/logging/MDCLoggingContext.java  |   8 +-
 .../reporters/solr/SolrClusterReporter.java     |   2 +-
 .../reporters/solr/SolrShardReporter.java       |   2 +-
 .../org/apache/solr/query/SolrRangeQuery.java   |   5 +-
 .../apache/solr/search/ValueSourceParser.java   |   8 +
 .../solr/search/facet/UniqueBlockAgg.java       |  91 +++
 .../search/facet/UniqueSinglevaluedSlotAcc.java |  16 +-
 .../apache/solr/search/join/FiltersQParser.java |  38 +-
 .../solr/security/PKIAuthenticationPlugin.java  |   9 +-
 .../org/apache/solr/servlet/HttpSolrCall.java   |   6 +-
 .../apache/solr/servlet/LoadAdminUiServlet.java |  14 +-
 .../solr/servlet/ServletInputStreamWrapper.java |   2 +-
 .../servlet/ServletOutputStreamWrapper.java     |   2 +-
 .../apache/solr/servlet/SolrDispatchFilter.java | 141 ++--
 .../apache/solr/servlet/SolrRequestParsers.java |   8 +-
 .../solr/spelling/SpellCheckCollator.java       |   4 +-
 .../apache/solr/uninverting/DocTermOrds.java    |   5 +-
 .../org/apache/solr/update/CommitTracker.java   |  66 +-
 .../solr/update/DefaultSolrCoreState.java       |   5 +-
 .../solr/update/DirectUpdateHandler2.java       |  45 +-
 .../java/org/apache/solr/update/PeerSync.java   |   2 +-
 .../apache/solr/update/SolrCmdDistributor.java  |   8 +-
 .../solr/update/StreamingSolrClients.java       |   2 +-
 .../org/apache/solr/update/TransactionLog.java  |   7 +
 .../java/org/apache/solr/update/UpdateLog.java  |   7 +
 .../apache/solr/update/UpdateShardHandler.java  |  68 +-
 .../processor/DistributedUpdateProcessor.java   |   2 +-
 .../IgnoreLargeDocumentProcessorFactory.java    | 174 +++++
 .../src/java/org/apache/solr/util/SolrCLI.java  |  15 +
 .../org/apache/solr/util/SystemIdResolver.java  |  14 +-
 .../conf/bad-solrconfig-no-autocommit-tag.xml   |  52 ++
 .../solr/collection1/conf/solrconfig-tlog.xml   |   4 +
 .../solr/cloud/DocValuesNotIndexedTest.java     |   1 +
 .../solr/cloud/LIRRollingUpdatesTest.java       |   3 +
 .../cloud/LeaderElectionIntegrationTest.java    |   1 +
 .../apache/solr/cloud/OverseerRolesTest.java    |   1 +
 .../apache/solr/cloud/SolrCloudExampleTest.java |   1 +
 .../collections/TestHdfsCloudBackupRestore.java |   2 +
 .../sim/SimClusterStateProvider.java            |   3 +
 .../test/org/apache/solr/core/TestConfig.java   |  36 +
 .../solr/handler/TestReplicationHandler.java    |   1 +
 .../apache/solr/schema/TestCloudSchemaless.java |   1 +
 .../apache/solr/search/QueryEqualityTest.java   |   1 +
 .../apache/solr/search/TestStressRecovery.java  |   1 +
 .../facet/TestJsonFacetsWithNestedObjects.java  |  26 +
 .../apache/solr/search/join/BJQParserTest.java  |  61 +-
 .../search/join/BlockJoinFacetDistribTest.java  |  77 +-
 .../spelling/WordBreakSolrSpellCheckerTest.java |  14 +-
 .../solr/update/MaxSizeAutoCommitTest.java      | 398 ++++++++++
 .../apache/solr/update/TransactionLogTest.java  |   9 +-
 ...IgnoreLargeDocumentProcessorFactoryTest.java | 102 +++
 .../apache/solr/util/TestSystemIdResolver.java  |  41 +-
 .../licenses/jackson-annotations-2.5.4.jar.sha1 |   1 -
 .../licenses/jackson-annotations-2.9.5.jar.sha1 |   1 +
 solr/licenses/jackson-core-2.5.4.jar.sha1       |   1 -
 solr/licenses/jackson-core-2.9.5.jar.sha1       |   1 +
 solr/licenses/jackson-databind-2.5.4.jar.sha1   |   1 -
 solr/licenses/jackson-databind-2.9.5.jar.sha1   |   1 +
 .../jackson-dataformat-smile-2.5.4.jar.sha1     |   1 -
 .../jackson-dataformat-smile-2.9.5.jar.sha1     |   1 +
 solr/solr-ref-guide/src/blockjoin-faceting.adoc |   3 +-
 solr/solr-ref-guide/src/json-facet-api.adoc     |  71 +-
 solr/solr-ref-guide/src/other-parsers.adoc      |   2 +-
 .../src/update-request-processors.adoc          |   2 +
 .../org/apache/solr/client/solrj/io/Lang.java   |  11 +-
 .../client/solrj/io/eval/CanberraEvaluator.java |  49 ++
 .../solrj/io/eval/ChebyshevEvaluator.java       |  49 ++
 .../client/solrj/io/eval/DistanceEvaluator.java | 118 ++-
 .../solrj/io/eval/EarthMoversEvaluator.java     |  49 ++
 .../solrj/io/eval/EuclideanEvaluator.java       |  49 ++
 .../solr/client/solrj/io/eval/FFTEvaluator.java |  73 ++
 .../client/solrj/io/eval/IFFTEvaluator.java     |  71 ++
 .../solr/client/solrj/io/eval/KnnEvaluator.java |  45 +-
 .../solrj/io/eval/ManhattanEvaluator.java       |  49 ++
 .../client/solrj/io/eval/OnesEvaluator.java     |  47 ++
 .../client/solrj/io/eval/ZerosEvaluator.java    |  47 ++
 .../apache/solr/client/solrj/io/TestLang.java   |   3 +-
 .../solrj/io/stream/MathExpressionTest.java     | 131 +++-
 196 files changed, 5958 insertions(+), 2482 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c3337599/lucene/ivy-versions.properties
----------------------------------------------------------------------