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/28 15:40:17 UTC
[34/35] 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/641b12df
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/641b12df
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/641b12df
Branch: refs/heads/jira/solr-11779
Commit: 641b12df30b236503fcd10725b2465509a3cb0e1
Parents: e805db7 d039730
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Mon May 28 17:27:28 2018 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Mon May 28 17:27:28 2018 +0200
----------------------------------------------------------------------
lucene/CHANGES.txt | 22 ++
lucene/MIGRATE.txt | 5 +
.../lucene/analysis/custom/CustomAnalyzer.java | 6 +
.../analysis/miscellaneous/protected-1.txt | 17 -
.../analysis/miscellaneous/protected-2.txt | 17 -
.../analysis/custom/TestCustomAnalyzer.java | 12 +-
.../analysis/miscellaneous/protected-1.txt | 17 +
.../analysis/miscellaneous/protected-2.txt | 17 +
.../lucene/analysis/cn/smart/CharType.java | 5 +
.../lucene/analysis/cn/smart/Utility.java | 4 +
.../analysis/cn/smart/hhmm/HHMMSegmenter.java | 18 +-
.../cn/smart/TestSmartChineseAnalyzer.java | 53 +++-
.../index/TestBackwardsCompatibility.java | 4 +-
.../lucene/index/unsupported.6.6.4-cfs.zip | Bin 0 -> 15782 bytes
.../lucene/index/unsupported.6.6.4-nocfs.zip | Bin 0 -> 15771 bytes
.../apache/lucene/document/FeatureQuery.java | 18 +-
.../apache/lucene/index/FilterMergePolicy.java | 20 +-
.../lucene/index/FrozenBufferedUpdates.java | 4 +-
.../org/apache/lucene/index/ImpactsEnum.java | 29 +-
.../org/apache/lucene/index/ImpactsSource.java | 54 ++++
.../org/apache/lucene/index/IndexWriter.java | 39 ++-
.../lucene/index/LogByteSizeMergePolicy.java | 4 +-
.../apache/lucene/index/LogDocMergePolicy.java | 4 +-
.../org/apache/lucene/index/LogMergePolicy.java | 134 ++++----
.../org/apache/lucene/index/MergePolicy.java | 127 ++++++--
.../org/apache/lucene/index/MergeTrigger.java | 2 +-
.../org/apache/lucene/index/NoMergePolicy.java | 10 +-
.../index/OneMergeWrappingMergePolicy.java | 12 +-
.../org/apache/lucene/index/ReaderPool.java | 4 +-
.../apache/lucene/index/ReadersAndUpdates.java | 9 +-
.../org/apache/lucene/index/SegmentReader.java | 21 +-
.../apache/lucene/index/TieredMergePolicy.java | 95 +++---
.../lucene/index/UpgradeIndexMergePolicy.java | 23 +-
.../org/apache/lucene/search/ImpactsDISI.java | 149 +++++++++
.../org/apache/lucene/search/MaxScoreCache.java | 50 ++-
.../lucene/search/QueryCachingPolicy.java | 13 -
.../org/apache/lucene/search/SynonymQuery.java | 290 +++++++++++++++--
.../org/apache/lucene/search/TermQuery.java | 6 +-
.../org/apache/lucene/search/TermScorer.java | 114 ++-----
.../java/org/apache/lucene/util/BitUtil.java | 2 +-
.../index/TestDemoParallelLeafReader.java | 16 +-
.../lucene/index/TestFilterMergePolicy.java | 4 +-
.../apache/lucene/index/TestIndexWriter.java | 36 ++-
.../index/TestOneMergeWrappingMergePolicy.java | 6 +-
.../lucene/index/TestPerSegmentDeletes.java | 8 +-
.../org/apache/lucene/index/TestReaderPool.java | 61 ++++
.../apache/lucene/search/TestLRUQueryCache.java | 63 ++--
.../apache/lucene/search/TestSynonymQuery.java | 235 +++++++++++++-
.../apache/lucene/search/TestTermScorer.java | 21 +-
lucene/ivy-versions.properties | 8 +-
lucene/licenses/hppc-0.7.3.jar.sha1 | 1 -
lucene/licenses/hppc-0.8.1.jar.sha1 | 1 +
lucene/licenses/morfologik-fsa-2.1.1.jar.sha1 | 1 -
lucene/licenses/morfologik-fsa-2.1.5.jar.sha1 | 1 +
.../licenses/morfologik-polish-2.1.1.jar.sha1 | 1 -
.../licenses/morfologik-polish-2.1.5.jar.sha1 | 1 +
.../licenses/morfologik-stemming-2.1.1.jar.sha1 | 1 -
.../licenses/morfologik-stemming-2.1.5.jar.sha1 | 1 +
.../apache/lucene/queries/mlt/MoreLikeThis.java | 8 +-
.../lucene/index/AlcoholicMergePolicy.java | 2 +-
.../lucene/index/BaseMergePolicyTestCase.java | 72 +++++
.../apache/lucene/index/ForceMergePolicy.java | 6 +-
.../lucene/index/MockRandomMergePolicy.java | 18 +-
solr/CHANGES.txt | 40 ++-
solr/contrib/clustering/README.txt | 2 +-
.../java/org/apache/solr/core/PluginBag.java | 12 +-
.../solr/handler/MoreLikeThisHandler.java | 42 ++-
.../solr/handler/component/ExpandComponent.java | 23 +-
.../solr/handler/component/FacetComponent.java | 2 +-
.../handler/component/HttpShardHandler.java | 2 +-
.../solr/handler/component/SearchHandler.java | 21 +-
.../handler/component/SpellCheckComponent.java | 8 +-
.../solr/handler/component/StatsComponent.java | 2 +-
.../solr/request/json/JsonQueryConverter.java | 25 +-
.../apache/solr/search/ExportQParserPlugin.java | 30 +-
.../org/apache/solr/search/ReRankCollector.java | 3 +-
.../apache/solr/search/SolrIndexSearcher.java | 4 +-
.../solr/search/facet/FacetProcessor.java | 13 +-
.../apache/solr/search/facet/FacetRequest.java | 119 +++++--
.../SearchGroupShardResponseProcessor.java | 2 +-
.../TopGroupsShardResponseProcessor.java | 2 +-
.../DocBasedVersionConstraintsProcessor.java | 19 +-
...BasedVersionConstraintsProcessorFactory.java | 20 +-
.../processor/UpdateRequestProcessorChain.java | 39 +++
.../src/test-files/runtimecode/TestURP.java | 30 ++
.../test-files/runtimecode/runtimeurp.jar.bin | Bin 0 -> 753 bytes
.../solrconfig-externalversionconstraint.xml | 25 ++
.../cloud/AssignBackwardCompatibilityTest.java | 1 +
.../cloud/ConcurrentCreateRoutedAliasTest.java | 1 +
.../apache/solr/cloud/DeleteReplicaTest.java | 1 +
.../solr/cloud/LIRRollingUpdatesTest.java | 1 +
.../solr/cloud/LeaderVoteWaitTimeoutTest.java | 2 +
.../apache/solr/cloud/MoveReplicaHDFSTest.java | 2 +-
.../solr/cloud/RestartWhileUpdatingTest.java | 2 +-
.../cloud/TestCloudJSONFacetJoinDomain.java | 92 ++++--
.../org/apache/solr/cloud/TestPullReplica.java | 3 +-
.../cloud/TestSolrCloudWithKerberosAlt.java | 1 +
.../solr/cloud/UnloadDistributedZkTest.java | 1 +
.../CollectionsAPIAsyncDistributedZkTest.java | 1 +
.../api/collections/CustomCollectionTest.java | 1 +
.../autoscaling/AutoScalingHandlerTest.java | 4 +-
.../autoscaling/ComputePlanActionTest.java | 1 +
.../cloud/autoscaling/IndexSizeTriggerTest.java | 3 +
.../cloud/autoscaling/NodeAddedTriggerTest.java | 27 +-
.../SearchRateTriggerIntegrationTest.java | 2 +
.../autoscaling/SearchRateTriggerTest.java | 20 +-
.../cloud/hdfs/HdfsUnloadDistributedZkTest.java | 2 +
.../apache/solr/cloud/hdfs/StressHdfsTest.java | 1 +
.../org/apache/solr/core/TestDynamicURP.java | 110 +++++++
.../solr/handler/MoreLikeThisHandlerTest.java | 163 ++++++----
.../org/apache/solr/handler/TestSQLHandler.java | 1 +
.../handler/component/SearchHandlerTest.java | 129 ++++++++
.../component/SpellCheckComponentTest.java | 2 +-
.../solr/search/facet/TestJsonFacets.java | 43 +++
.../solr/search/json/TestJsonRequest.java | 158 +++++++++-
.../solr/security/BasicAuthIntegrationTest.java | 1 +
.../update/TestDocBasedVersionConstraints.java | 44 +++
.../apache/solr/update/TestHdfsUpdateLog.java | 1 +
.../solr/update/TestInPlaceUpdatesDistrib.java | 1 +
.../solr/update/processor/RuntimeUrp.java | 3 +
solr/licenses/attributes-binder-1.3.1.jar.sha1 | 1 -
solr/licenses/attributes-binder-1.3.3.jar.sha1 | 1 +
solr/licenses/carrot2-mini-3.15.0.jar.sha1 | 1 -
solr/licenses/carrot2-mini-3.16.0.jar.sha1 | 1 +
solr/licenses/hppc-0.7.3.jar.sha1 | 1 -
solr/licenses/hppc-0.8.1.jar.sha1 | 1 +
solr/licenses/morfologik-fsa-2.1.1.jar.sha1 | 1 -
solr/licenses/morfologik-fsa-2.1.5.jar.sha1 | 1 +
solr/licenses/morfologik-polish-2.1.1.jar.sha1 | 1 -
solr/licenses/morfologik-polish-2.1.5.jar.sha1 | 1 +
.../licenses/morfologik-stemming-2.1.1.jar.sha1 | 1 -
.../licenses/morfologik-stemming-2.1.5.jar.sha1 | 1 +
solr/solr-ref-guide/src/result-clustering.adoc | 2 +-
...rcloud-query-routing-and-read-tolerance.adoc | 10 +-
.../src/updating-parts-of-documents.adoc | 1 +
.../client/solrj/cloud/autoscaling/Policy.java | 32 +-
.../solrj/cloud/autoscaling/PolicyHelper.java | 1 +
.../solrj/cloud/autoscaling/Preference.java | 3 -
.../client/solrj/cloud/autoscaling/Row.java | 10 +-
.../solr/client/solrj/request/V2Request.java | 5 +-
.../apache/solr/common/params/ShardParams.java | 28 +-
.../solrj/cloud/autoscaling/TestPolicy.java | 310 ++++++++++++++++++-
.../solr/common/params/ShardParamsTest.java | 32 +-
143 files changed, 2940 insertions(+), 818 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/641b12df/lucene/ivy-versions.properties
----------------------------------------------------------------------