You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2019/10/30 15:01:20 UTC

[lucene-solr] 02/03: Merge branch 'master' into simd

This is an automated email from the ASF dual-hosted git repository.

jpountz pushed a commit to branch simd
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit c2d2927a8c2d9a8cbbcb21d56cc80e5e781868cf
Merge: e24b6e6 f23d5c1
Author: Adrien Grand <jp...@gmail.com>
AuthorDate: Tue Oct 29 16:59:36 2019 +0100

    Merge branch 'master' into simd

 .asf.yaml                                          |   19 +
 dev-tools/scripts/jenkins.build.ref.guide.sh       |    9 +-
 lucene/CHANGES.txt                                 |   22 +-
 .../miscellaneous/WordDelimiterGraphFilter.java    |   14 +-
 .../TestWordDelimiterGraphFilter.java              |   31 +
 .../src/java/org/apache/lucene/geo/Polygon2D.java  |    9 +-
 .../org/apache/lucene/search/BooleanQuery.java     |   21 +-
 .../apache/lucene/search/BottomValueChecker.java   |   52 -
 .../org/apache/lucene/search/IndexSearcher.java    |   10 +-
 .../apache/lucene/search/MaxScoreAccumulator.java  |   90 ++
 .../apache/lucene/search/TopFieldCollector.java    |   97 +-
 .../apache/lucene/search/TopScoreDocCollector.java |  103 +-
 .../java/org/apache/lucene/util/IntroSelector.java |   97 +-
 .../java/org/apache/lucene/util/bkd/BKDReader.java |  236 ++++-
 .../lucene/search/TestMaxScoreAccumulator.java     |   57 +
 .../org/apache/lucene/search/TestQueryVisitor.java |   18 +
 .../apache/lucene/search/TestTopDocsCollector.java |  204 +++-
 .../lucene/search/TestTopFieldCollector.java       |  195 ++++
 .../org/apache/lucene/util/TestIntroSelector.java  |    2 +-
 .../test/org/apache/lucene/util/bkd/TestBKD.java   |   18 +-
 .../lucene/search/grouping/TopGroupsTest.java      |  235 +++++
 lucene/ivy-versions.properties                     |    7 +-
 .../search/join/GlobalOrdinalsWithScoreQuery.java  |    7 +
 .../src/java/org/apache/lucene/geo/Line2D.java     |   12 +-
 .../lucene/document/BaseShapeEncodingTestCase.java |    1 -
 .../lucene/analysis/BaseTokenStreamTestCase.java   |   17 +-
 solr/CHANGES.txt                                   |   60 +-
 .../solr/handler/dataimport/DataImportHandler.java |    8 +-
 .../apache/solr/ltr/model/DefaultWrapperModel.java |    2 +-
 .../src/java/org/apache/solr/api/AnnotatedApi.java |    4 +
 .../src/java/org/apache/solr/cloud/CloudUtil.java  |    6 +-
 .../org/apache/solr/cloud/ReplicateFromLeader.java |    2 +-
 .../java/org/apache/solr/cloud/ZkController.java   |    1 +
 .../solr/cloud/api/collections/MoveReplicaCmd.java |    8 +-
 .../solr/cloud/autoscaling/AutoScalingHandler.java |    2 +-
 .../solr/cloud/autoscaling/ScheduledTriggers.java  |   61 ++
 .../cloud/autoscaling/sim/FakeDocIterator.java     |    0
 .../cloud/autoscaling/sim/SimCloudManager.java     |    7 +-
 .../autoscaling/sim/SimClusterStateProvider.java   |   13 +
 .../solr/cloud/autoscaling/sim/SimScenario.java    | 1091 ++++++++++++++++++++
 .../solr/cloud/autoscaling/sim/SimUtils.java       |   16 +-
 .../java/org/apache/solr/core/CoreContainer.java   |  113 +-
 .../org/apache/solr/core/HdfsDirectoryFactory.java |   15 +-
 .../src/java/org/apache/solr/core/PluginBag.java   |   46 +-
 .../src/java/org/apache/solr/core/PluginInfo.java  |   44 +-
 .../java/org/apache/solr/core/RequestParams.java   |    9 +
 .../src/java/org/apache/solr/core/SolrCore.java    |   90 +-
 .../java/org/apache/solr/core/SolrInfoBean.java    |    9 +-
 .../org/apache/solr/core/SolrResourceLoader.java   |  336 +++---
 .../apache/solr/filestore/DistribPackageStore.java |   17 +-
 .../org/apache/solr/filestore/PackageStoreAPI.java |    2 +-
 .../apache/solr/handler/ReplicationHandler.java    |   47 +-
 .../apache/solr/handler/RequestHandlerBase.java    |   49 +-
 .../org/apache/solr/handler/SolrConfigHandler.java |   57 +-
 .../solr/handler/admin/CoreAdminHandler.java       |    9 +-
 .../solr/handler/admin/CoreAdminOperation.java     |    2 +
 .../apache/solr/handler/admin/MetricsHandler.java  |    4 +-
 .../solr/handler/component/ExpandComponent.java    |   32 +-
 .../solr/handler/component/HttpShardHandler.java   |    1 +
 .../handler/component/HttpShardHandlerFactory.java |  376 ++-----
 .../solr/handler/component/QueryComponent.java     |    2 +
 .../solr/handler/component/SearchHandler.java      |   60 +-
 .../solr/handler/component/SuggestComponent.java   |   23 +-
 .../solr/handler/component/TermsComponent.java     |   17 +-
 .../solr/highlight/HighlightingPluginBase.java     |   19 +-
 .../apache/solr/metrics/SolrCoreMetricManager.java |   51 +-
 .../org/apache/solr/metrics/SolrMetricManager.java |   28 +-
 .../apache/solr/metrics/SolrMetricProducer.java    |   62 +-
 .../apache/solr/metrics/SolrMetricsContext.java    |  114 ++
 .../src/java/org/apache/solr/pkg/PackageAPI.java   |  383 +++++++
 .../java/org/apache/solr/pkg/PackageListeners.java |  111 ++
 .../java/org/apache/solr/pkg/PackageLoader.java    |  299 ++++++
 .../org/apache/solr/pkg/PackagePluginHolder.java   |  123 +++
 .../org/apache/solr/request/json/RequestUtil.java  |    2 +-
 .../apache/solr/schema/JsonPreAnalyzedParser.java  |    2 +-
 .../java/org/apache/solr/search/CaffeineCache.java |   18 +-
 .../java/org/apache/solr/search/FastLRUCache.java  |   55 +-
 .../src/java/org/apache/solr/search/Grouping.java  |    5 +-
 .../src/java/org/apache/solr/search/LFUCache.java  |   27 +-
 .../src/java/org/apache/solr/search/LRUCache.java  |   37 +-
 .../java/org/apache/solr/search/PointMerger.java   |    4 +
 .../src/java/org/apache/solr/search/SolrCache.java |    4 +-
 .../org/apache/solr/search/SolrCacheHolder.java    |   12 +-
 .../org/apache/solr/search/SolrFieldCacheBean.java |   16 +-
 .../org/apache/solr/search/SolrIndexSearcher.java  |   69 +-
 .../distributed/command/GroupConverter.java        |   13 +-
 .../grouping/distributed/command/QueryCommand.java |   53 +-
 .../TopGroupsResultTransformer.java                |    2 +-
 .../java/org/apache/solr/security/AuditEvent.java  |   22 +-
 .../apache/solr/security/AuditLoggerPlugin.java    |   45 +-
 .../apache/solr/security/AuthenticationPlugin.java |   61 +-
 .../solr/security/MultiDestinationAuditLogger.java |   10 +-
 .../solr/security/PermissionNameProvider.java      |    3 +
 .../java/org/apache/solr/servlet/HttpSolrCall.java |   26 +-
 .../apache/solr/servlet/SolrDispatchFilter.java    |    3 +-
 .../org/apache/solr/store/blockcache/Metrics.java  |   20 +-
 .../solr/store/hdfs/HdfsLocalityReporter.java      |   21 +-
 .../apache/solr/update/DirectUpdateHandler2.java   |   67 +-
 .../src/java/org/apache/solr/update/PeerSync.java  |   10 +-
 .../org/apache/solr/update/PeerSyncWithLeader.java |   10 +-
 .../org/apache/solr/update/SolrIndexWriter.java    |   38 +-
 .../java/org/apache/solr/update/UpdateHandler.java |    6 -
 .../src/java/org/apache/solr/update/UpdateLog.java |   24 +-
 .../org/apache/solr/update/UpdateShardHandler.java |   25 +-
 .../processor/DistributedUpdateProcessor.java      |   12 +-
 .../processor/DistributedZkUpdateProcessor.java    |   12 +-
 .../processor/UpdateRequestProcessorChain.java     |   43 +-
 .../src/java/org/apache/solr/util/SolrCLI.java     |   17 +-
 .../java/org/apache/solr/util/TestInjection.java   |    8 -
 .../stats/InstrumentedHttpListenerFactory.java     |   17 +-
 .../stats/InstrumentedHttpRequestExecutor.java     |   22 +-
 ...rumentedPoolingHttpClientConnectionManager.java |   30 +-
 .../test-files/solr/collection1/conf/schema.xml    |    5 +
 .../solr/security/auditlog_plugin_security.json    |    4 +-
 .../src/test/org/apache/solr/SolrInfoBeanTest.java |    4 +-
 .../org/apache/solr/TestDistributedGrouping.java   |   20 +-
 .../test/org/apache/solr/TestGroupingSearch.java   |   40 +
 .../org/apache/solr/cloud/MoveReplicaTest.java     |   49 +-
 .../cloud/RoutingToNodesWithPropertiesTest.java    |    9 +-
 .../apache/solr/cloud/TestLRUStatsCacheCloud.java  |    3 +-
 .../solr/cloud/TestQueryingOnDownCollection.java   |    8 -
 .../org/apache/solr/cloud/TestTlogReplica.java     |  205 ++--
 .../AutoAddReplicasIntegrationTest.java            |    2 +-
 .../autoscaling/AutoAddReplicasPlanActionTest.java |    2 +-
 .../cloud/autoscaling/sim/TestSimScenario.java     |  138 +++
 .../autoscaling/sim/TestSnapshotCloudManager.java  |   10 +-
 .../apache/solr/core/HdfsDirectoryFactoryTest.java |    3 +-
 .../test/org/apache/solr/core/MockInfoBean.java    |   19 +-
 .../core/MockQuerySenderListenerReqHandler.java    |    8 +-
 .../test/org/apache/solr/core/TestBadConfig.java   |    2 +-
 .../apache/solr/core/TestSolrConfigHandler.java    |    2 +-
 .../solr/filestore/TestDistribPackageStore.java    |    7 +-
 .../org/apache/solr/handler/TestReqParamsAPI.java  |   10 +
 .../solr/handler/TestSolrConfigHandlerCloud.java   |    9 +
 .../solr/handler/admin/MetricsHandlerTest.java     |  146 ++-
 .../handler/admin/MetricsHistoryHandlerTest.java   |    7 +-
 .../component/DistributedExpandComponentTest.java  |    4 +-
 .../component/DistributedTermsComponentTest.java   |   26 +-
 .../solr/handler/component/TermsComponentTest.java |  102 +-
 .../handler/component/TestExpandComponent.java     |  176 ++--
 .../component/TestHttpShardHandlerFactory.java     |  211 ----
 .../apache/solr/metrics/SolrMetricTestUtils.java   |    4 +-
 .../src/test/org/apache/solr/pkg/TestPackages.java |  496 +++++++++
 .../org/apache/solr/search/TestCaffeineCache.java  |    7 +-
 .../org/apache/solr/search/TestFastLRUCache.java   |   40 +-
 .../test/org/apache/solr/search/TestLFUCache.java  |   16 +-
 .../test/org/apache/solr/search/TestLRUCache.java  |   22 +-
 .../apache/solr/search/TestSolrFieldCacheBean.java |    7 +-
 .../solr/search/facet/TestJsonFacetRefinement.java |    4 +-
 .../apache/solr/search/facet/TestJsonFacets.java   |    9 +-
 .../solr/search/join/TestCloudNestedDocsSort.java  |   16 +-
 .../solr/security/AuditLoggerIntegrationTest.java  |  413 +++++---
 .../solr/security/BasicAuthIntegrationTest.java    |    6 +-
 .../solr/security/BasicAuthOnSingleNodeTest.java   |   12 +-
 .../solr/security/CallbackAuditLoggerPlugin.java   |   29 +-
 .../solr/store/blockcache/BufferStoreTest.java     |    4 +-
 .../apache/solr/update/processor/RuntimeUrp.java   |    2 +-
 .../UpdateRequestProcessorFactoryTest.java         |   10 +-
 .../asciidoctor-ant-1.6.0-alpha.5.jar.sha1         |    1 -
 solr/licenses/asciidoctor-ant-1.6.2.jar.sha1       |    1 +
 solr/solr-ref-guide/README.adoc                    |   26 +-
 solr/solr-ref-guide/src/_config.yml.template       |    4 +-
 .../adding-custom-plugins-in-solrcloud-mode.adoc   |   13 +-
 solr/solr-ref-guide/src/aliases.adoc               |    6 +-
 .../authentication-and-authorization-plugins.adoc  |   10 +-
 .../src/basic-authentication-plugin.adoc           |    2 +-
 .../src/cluster-node-management.adoc               |    2 +-
 .../src/common-query-parameters.adoc               |    2 +-
 solr/solr-ref-guide/src/enabling-ssl.adoc          |    2 +-
 .../src/jwt-authentication-plugin.adoc             |    2 +-
 .../src/kerberos-authentication-plugin.adoc        |    2 +-
 solr/solr-ref-guide/src/metrics-reporting.adoc     |    6 +-
 ...onitoring-solr-with-prometheus-and-grafana.adoc |    6 +-
 .../src/performance-statistics-reference.adoc      |    2 +-
 .../src/query-settings-in-solrconfig.adoc          |    3 +-
 .../solr-ref-guide/src/request-parameters-api.adoc |   29 +-
 .../src/resource-and-plugin-loading.adoc           |    2 +-
 .../src/rule-based-authorization-plugin.adoc       |    2 +-
 .../setting-up-an-external-zookeeper-ensemble.adoc |    6 +-
 .../src/solr-control-script-reference.adoc         |   14 +-
 solr/solr-ref-guide/src/solr-tracing.adoc          |    2 +-
 solr/solr-ref-guide/src/solr-tutorial.adoc         |    2 +-
 solr/solr-ref-guide/src/solr-upgrade-notes.adoc    |   65 ++
 .../src/solrcloud-autoscaling-api.adoc             |   12 +-
 .../solrcloud-autoscaling-policy-preferences.adoc  |  143 ++-
 .../src/solrcloud-autoscaling-triggers.adoc        |   10 +-
 .../src/taking-solr-to-production.adoc             |   18 +-
 .../src/the-standard-query-parser.adoc             |    4 +-
 .../src/updating-parts-of-documents.adoc           |    2 +-
 ...ding-data-with-solr-cell-using-apache-tika.adoc |    6 +-
 ...ng-zookeeper-to-manage-configuration-files.adoc |    2 +-
 solr/solrj/ivy.xml                                 |    2 +
 .../solrj/impl/SolrClientNodeStateProvider.java    |    2 +-
 .../solr/client/solrj/request/beans/Package.java}  |   35 +-
 .../client/solrj/request/beans/pakage-info.java}   |   17 +-
 .../routing}/AffinityReplicaListTransformer.java   |   14 +-
 .../AffinityReplicaListTransformerFactory.java     |   18 +-
 .../routing/NodePreferenceRulesComparator.java     |  179 ++++
 .../solrj/{impl => routing}/PreferenceRule.java    |    2 +-
 .../solrj/routing}/ReplicaListTransformer.java     |    2 +-
 .../routing}/ReplicaListTransformerFactory.java    |    8 +-
 .../RequestReplicaListTransformerGenerator.java    |  168 +++
 .../routing}/ShufflingReplicaListTransformer.java  |    4 +-
 .../solr/client/solrj/routing/package-info.java}   |   21 +-
 .../solr/common}/cloud/NodesSysPropsCacher.java    |   18 +-
 .../org/apache/solr/common/cloud/SolrZkClient.java |    9 +-
 .../apache/solr/common/cloud/ZkStateReader.java    |    1 +
 .../apache/solr/common/util/CommandOperation.java  |    5 +-
 .../solr/common/util/CommonTestInjection.java}     |   26 +-
 .../org/apache/solr/common/util/ExecutorUtil.java  |    1 +
 .../org/apache/solr/common/util/NamedList.java     |    2 +-
 .../apache/solr/common}/util/ReflectMapWriter.java |    4 +-
 .../java/org/apache/solr/common/util/StrUtils.java |    2 +-
 .../java/org/apache/solr/common/util/Utils.java    |   35 +-
 solr/solrj/src/java/org/noggit/ObjectBuilder.java  |   43 +-
 .../apispec/core.config.Params.Commands.json       |    2 +-
 .../apache/solr/client/solrj/SolrExampleTests.java |   39 +
 .../client/solrj/cloud/autoscaling/TestPolicy.java |   39 +-
 .../solr/client/solrj/request/TestV2Request.java   |   18 +-
 .../routing/NodePreferenceRulesComparatorTest.java |  155 +++
 .../solrj/routing}/ReplicaListTransformerTest.java |    3 +-
 ...RequestReplicaListTransformerGeneratorTest.java |  152 +++
 .../ShufflingReplicaListTransformerTest.java       |    2 +-
 .../org/apache/solr/common/util/NamedListTest.java |   10 +
 .../src/test/org/noggit/TestObjectBuilder.java     |   33 +-
 225 files changed, 7718 insertions(+), 2375 deletions(-)