You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2019/10/29 08:21:34 UTC

[lucene-solr] branch jira/SOLR-13661 updated (a292b07 -> 9dc4fe3)

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

noble pushed a change to branch jira/SOLR-13661
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.


    from a292b07  fixing failures in Windows
     add 9dc4fe3  update to master

No new revisions were added by this update.

Summary of changes:
 dev-tools/maven/pom.xml.template                   |    2 +-
 dev-tools/scripts/jenkins.build.ref.guide.sh       |    9 +-
 lucene/CHANGES.txt                                 |   44 +-
 .../miscellaneous/WordDelimiterGraphFilter.java    |   14 +-
 .../analysis/query/QueryAutoStopWordAnalyzer.java  |    8 +-
 .../TestWordDelimiterGraphFilter.java              |   31 +
 .../analysis/ja/dict/TokenInfoDictionary$fst.dat   |  Bin 1698570 -> 1698570 bytes
 .../analysis/ko/dict/TokenInfoDictionary$fst.dat   |  Bin 5641400 -> 5640903 bytes
 .../lucene/benchmark/byTask/utils/Config.java      |   19 +-
 .../blocktreeords/OrdsBlockTreeTermsReader.java    |    3 +-
 .../codecs/bloom/BloomFilteringPostingsFormat.java |    3 +-
 .../lucene/codecs/memory/FSTOrdTermsReader.java    |    3 +-
 .../lucene/codecs/memory/FSTTermsReader.java       |    3 +-
 lucene/common-build.xml                            |    4 +-
 .../codecs/blocktree/BlockTreeTermsReader.java     |    3 +-
 .../LatLonDocValuesPointInPolygonQuery.java        |    5 +-
 .../lucene/document/LatLonPointInPolygonQuery.java |   21 +-
 .../java/org/apache/lucene/document/LongPoint.java |    2 +-
 .../java/org/apache/lucene/geo/Component2D.java    |   96 ++
 .../java/org/apache/lucene/geo/ComponentTree.java  |  206 ++++
 .../src/java/org/apache/lucene/geo/EdgeTree.java   |  503 ++++-----
 .../org/apache/lucene/geo/GeoEncodingUtils.java    |   17 +-
 .../src/java/org/apache/lucene/geo/Polygon2D.java  |  224 ++--
 .../apache/lucene/index/BaseCompositeReader.java   |   24 +-
 .../java/org/apache/lucene/index/IndexReader.java  |    7 +-
 .../org/apache/lucene/search/BooleanQuery.java     |   14 +-
 .../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 +-
 .../src/java/org/apache/lucene/util/SetOnce.java   |   36 +-
 .../java/org/apache/lucene/util/bkd/BKDReader.java |  236 ++++-
 .../java/org/apache/lucene/util/fst/Builder.java   |    3 -
 .../src/java/org/apache/lucene/util/fst/FST.java   |  106 +-
 .../codecs/lucene60/TestLucene60PointsFormat.java  |    4 +-
 .../test/org/apache/lucene/geo/TestPolygon2D.java  |   88 +-
 .../lucene/index/TestFilterDirectoryReader.java    |   72 ++
 .../apache/lucene/search/TestIndexSearcher.java    |    2 +-
 .../lucene/search/TestMaxScoreAccumulator.java     |   57 +
 .../org/apache/lucene/search/TestQueryVisitor.java |   18 +
 .../apache/lucene/search/TestTopDocsCollector.java |  204 +++-
 .../lucene/search/TestTopFieldCollector.java       |  195 ++++
 .../test/org/apache/lucene/util/TestSetOnce.java   |    9 +
 .../test/org/apache/lucene/util/bkd/TestBKD.java   |   18 +-
 .../lucene/search/grouping/TopGroupsTest.java      |  235 +++++
 lucene/ivy-versions.properties                     |   19 +-
 .../search/join/GlobalOrdinalsWithScoreQuery.java  |    7 +
 .../monitor/MultipassTermFilteredPresearcher.java  |    4 +-
 .../lucene/monitor/TermFilteredPresearcher.java    |    4 +-
 .../builders/MultiPhraseQueryNodeBuilder.java      |   10 +-
 .../apache/lucene/queryparser/xml/CoreParser.java  |   35 +-
 .../lucene/queryparser/xml/TestCoreParser.java     |    6 +-
 .../lucene/replicator/IndexReplicationHandler.java |    3 +-
 .../idversion/VersionBlockTreeTermsReader.java     |    3 +-
 .../lucene/document/LatLonShapeLineQuery.java      |    5 +-
 .../lucene/document/LatLonShapePolygonQuery.java   |    5 +-
 .../apache/lucene/document/XYShapeLineQuery.java   |   13 +-
 .../lucene/document/XYShapePolygonQuery.java       |    6 +-
 .../src/java/org/apache/lucene/geo/Line2D.java     |  134 ++-
 .../java/org/apache/lucene/geo/XYPolygon2D.java    |   10 +-
 .../lucene/document/BaseLatLonShapeTestCase.java   |    5 +-
 .../lucene/document/BaseShapeEncodingTestCase.java |    6 +-
 .../apache/lucene/document/BaseShapeTestCase.java  |   17 +-
 .../lucene/document/BaseXYShapeTestCase.java       |    5 +-
 .../document/TestLatLonLineShapeQueries.java       |   19 +-
 .../document/TestLatLonMultiLineShapeQueries.java  |   22 +-
 .../document/TestLatLonMultiPointShapeQueries.java |   22 +-
 .../TestLatLonMultiPolygonShapeQueries.java        |   22 +-
 .../document/TestLatLonPointShapeQueries.java      |   18 +-
 .../document/TestLatLonPolygonShapeQueries.java    |   18 +-
 .../apache/lucene/document/TestLatLonShape.java    |   11 +-
 .../lucene/document/TestLatLonShapeEncoding.java   |    3 +-
 .../lucene/document/TestXYLineShapeQueries.java    |   19 +-
 .../document/TestXYMultiLineShapeQueries.java      |   22 +-
 .../document/TestXYMultiPointShapeQueries.java     |   22 +-
 .../document/TestXYMultiPolygonShapeQueries.java   |   22 +-
 .../lucene/document/TestXYPointShapeQueries.java   |   18 +-
 .../lucene/document/TestXYPolygonShapeQueries.java |   18 +-
 .../lucene/document/TestXYShapeEncoding.java       |    3 +-
 .../src/test/org/apache/lucene/geo/TestLine2D.java |   18 +-
 .../lucene/spatial3d/geom/StandardObjects.java     |    4 +-
 .../search/suggest/document/ContextQuery.java      |    6 +-
 .../lucene/analysis/BaseTokenStreamTestCase.java   |   17 +-
 .../org/apache/lucene/util/LuceneTestCase.java     |   60 +-
 .../org/apache/lucene/util/TestExpectThrows.java   |    2 +-
 .../dependencies/GetMavenDependenciesTask.java     |   22 +-
 solr/CHANGES.txt                                   |   48 +-
 .../solr/analytics/AnalyticsRequestManager.java    |    6 +-
 .../solr/handler/dataimport/DataImportHandler.java |    8 +-
 .../solr/handler/dataimport/RegexTransformer.java  |    3 +-
 .../apache/solr/ltr/model/DefaultWrapperModel.java |    2 +-
 .../solr/prometheus/collector/MetricSamples.java   |    7 +-
 .../solr/response/VelocityResponseWriter.java      |    5 +-
 .../src/java/org/apache/solr/api/AnnotatedApi.java |    2 +-
 .../client/solrj/embedded/EmbeddedSolrServer.java  |    4 +-
 .../client/solrj/embedded/JettySolrRunner.java     |   31 +-
 .../src/java/org/apache/solr/cloud/CloudUtil.java  |    6 +-
 .../apache/solr/cloud/OverseerTaskProcessor.java   |    6 +-
 .../org/apache/solr/cloud/ReplicateFromLeader.java |    2 +-
 .../java/org/apache/solr/cloud/ZkController.java   |    8 +-
 .../java/org/apache/solr/cloud/ZkShardTerms.java   |    5 +-
 .../solr/cloud/api/collections/CreateShardCmd.java |   10 +-
 .../cloud/api/collections/DeleteReplicaCmd.java    |    5 +-
 .../solr/cloud/api/collections/MoveReplicaCmd.java |    8 +-
 .../OverseerCollectionMessageHandler.java          |    8 +-
 .../api/collections/ReindexCollectionCmd.java      |    3 +-
 .../solr/cloud/api/collections/SplitShardCmd.java  |    7 +-
 .../solr/cloud/autoscaling/AutoScalingHandler.java |    2 +-
 .../solr/cloud/autoscaling/ExecutePlanAction.java  |    2 +-
 .../solr/cloud/autoscaling/IndexSizeTrigger.java   |    2 +-
 .../cloud/autoscaling/OverseerTriggerThread.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 +
 .../autoscaling/sim/SimNodeStateProvider.java      |    3 +-
 .../solr/cloud/autoscaling/sim/SimScenario.java    | 1091 ++++++++++++++++++++
 .../solr/cloud/autoscaling/sim/SimUtils.java       |   16 +-
 .../java/org/apache/solr/core/CoreContainer.java   |  103 +-
 .../org/apache/solr/core/HdfsDirectoryFactory.java |   15 +-
 .../src/java/org/apache/solr/core/PluginBag.java   |   33 +-
 .../src/java/org/apache/solr/core/PluginInfo.java  |    5 +
 .../src/java/org/apache/solr/core/SolrCore.java    |   71 +-
 .../src/java/org/apache/solr/core/SolrCores.java   |   11 +-
 .../java/org/apache/solr/core/SolrInfoBean.java    |    9 +-
 .../org/apache/solr/core/SolrResourceLoader.java   |    5 +-
 .../apache/solr/filestore/DistribPackageStore.java |    4 +-
 .../org/apache/solr/filestore/PackageStoreAPI.java |    2 +-
 .../apache/solr/handler/ReplicationHandler.java    |   47 +-
 .../apache/solr/handler/RequestHandlerBase.java    |   41 +-
 .../org/apache/solr/handler/SolrConfigHandler.java |   20 +-
 .../solr/handler/admin/CollectionsHandler.java     |    2 +-
 .../solr/handler/admin/CoreAdminHandler.java       |   15 +-
 .../solr/handler/admin/CoreAdminOperation.java     |    2 +
 .../apache/solr/handler/admin/MetricsHandler.java  |    4 +-
 .../handler/admin/SegmentsInfoRequestHandler.java  |    3 +-
 .../solr/handler/component/ExpandComponent.java    |   14 +-
 .../solr/handler/component/HttpShardHandler.java   |    1 +
 .../handler/component/HttpShardHandlerFactory.java |  376 ++-----
 .../handler/component/QueryElevationComponent.java |    2 +-
 .../solr/handler/component/SearchHandler.java      |    3 +-
 .../solr/handler/component/SuggestComponent.java   |   23 +-
 .../solr/handler/component/TermsComponent.java     |   33 +-
 .../apache/solr/handler/loader/CSVLoaderBase.java  |    6 +-
 .../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 ++
 .../solr/metrics/reporters/SolrJmxReporter.java    |    2 +
 .../metrics/reporters/jmx/JmxMetricsReporter.java  |    4 +-
 .../org/apache/solr/request/json/RequestUtil.java  |    2 +-
 .../solr/response/PHPSerializedResponseWriter.java |   11 +-
 .../src/java/org/apache/solr/rest/RestManager.java |    5 +-
 .../solr/rest/schema/FieldTypeXmlAdapter.java      |    5 +-
 .../analysis/ManagedSynonymFilterFactory.java      |   23 +-
 .../analysis/ManagedSynonymGraphFilterFactory.java |    6 +-
 .../solr/schema/FileExchangeRateProvider.java      |    6 +-
 .../apache/solr/schema/JsonPreAnalyzedParser.java  |    2 +-
 .../java/org/apache/solr/schema/SchemaManager.java |    2 +-
 .../java/org/apache/solr/search/CacheConfig.java   |    2 +-
 .../java/org/apache/solr/search/CaffeineCache.java |   29 +-
 .../java/org/apache/solr/search/FastLRUCache.java  |   39 +-
 .../src/java/org/apache/solr/search/LFUCache.java  |   25 +-
 .../src/java/org/apache/solr/search/LRUCache.java  |   35 +-
 .../java/org/apache/solr/search/PointMerger.java   |    4 +
 .../src/java/org/apache/solr/search/SolrCache.java |    8 +-
 .../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 +-
 .../TopGroupsShardRequestFactory.java              |    3 +-
 .../SearchGroupShardResponseProcessor.java         |   10 +-
 .../TopGroupsShardResponseProcessor.java           |   18 +-
 .../apache/solr/search/stats/LocalStatsCache.java  |    1 +
 .../org/apache/solr/search/stats/StatsUtil.java    |    1 +
 .../java/org/apache/solr/security/AuditEvent.java  |   22 +-
 .../apache/solr/security/AuditLoggerPlugin.java    |   45 +-
 .../apache/solr/security/AuthenticationPlugin.java |   56 +-
 .../solr/security/MultiDestinationAuditLogger.java |   10 +-
 .../java/org/apache/solr/servlet/HttpSolrCall.java |   55 +-
 .../apache/solr/servlet/SolrDispatchFilter.java    |    5 +-
 .../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 +-
 .../AddSchemaFieldsUpdateProcessorFactory.java     |   14 +-
 .../CloneFieldUpdateProcessorFactory.java          |    4 +-
 .../processor/DistributedUpdateProcessor.java      |   12 +-
 .../processor/DistributedZkUpdateProcessor.java    |   12 +-
 .../org/apache/solr/util/ConcurrentLFUCache.java   |    3 +-
 .../org/apache/solr/util/ConcurrentLRUCache.java   |   16 +-
 .../src/java/org/apache/solr/util/JmxUtil.java     |    1 +
 .../java/org/apache/solr/util/SimplePostTool.java  |    6 +-
 .../src/java/org/apache/solr/util/SolrCLI.java     |   20 +-
 .../java/org/apache/solr/util/SolrPluginUtils.java |    8 +-
 .../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   |    7 +-
 .../test/org/apache/solr/TestGroupingSearch.java   |   25 +
 .../org/apache/solr/cloud/MoveReplicaTest.java     |   49 +-
 .../cloud/RoutingToNodesWithPropertiesTest.java    |    9 +-
 .../test/org/apache/solr/cloud/SplitShardTest.java |   95 +-
 .../apache/solr/cloud/TestLRUStatsCacheCloud.java  |    3 +-
 .../solr/cloud/TestQueryingOnDownCollection.java   |  151 +++
 .../org/apache/solr/cloud/TestTlogReplica.java     |  205 ++--
 .../AutoAddReplicasIntegrationTest.java            |   11 +-
 .../autoscaling/AutoAddReplicasPlanActionTest.java |    2 +-
 .../cloud/autoscaling/sim/TestSimScenario.java     |  138 +++
 .../autoscaling/sim/TestSimTriggerIntegration.java |    3 +-
 .../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     |  147 ++-
 .../component/TestHttpShardHandlerFactory.java     |  211 ----
 .../apache/solr/metrics/SolrMetricTestUtils.java   |    4 +-
 .../org/apache/solr/search/TestCaffeineCache.java  |   12 +-
 .../org/apache/solr/search/TestFastLRUCache.java   |   56 +-
 .../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    |    4 +-
 .../solr/security/BasicAuthOnSingleNodeTest.java   |   12 +-
 .../solr/security/CallbackAuditLoggerPlugin.java   |   29 +-
 .../solr/store/blockcache/BlockCacheTest.java      |    8 +-
 .../solr/store/blockcache/BufferStoreTest.java     |    4 +-
 .../apache/solr/update/SolrCmdDistributorTest.java |    3 +-
 .../AbstractAtomicUpdatesMultivalueTestBase.java   |    7 +-
 .../UpdateRequestProcessorFactoryTest.java         |   10 +-
 .../asciidoctor-ant-1.6.0-alpha.5.jar.sha1         |    1 -
 solr/licenses/asciidoctor-ant-1.6.2.jar.sha1       |    1 +
 solr/licenses/netty-all-4.0.52.Final.jar.sha1      |    1 -
 solr/licenses/netty-all-4.1.29.Final.jar.sha1      |    1 +
 solr/licenses/netty-buffer-4.1.29.Final.jar.sha1   |    1 +
 .../netty-buffer-LICENSE-ASL.txt}                  |    0
 ...etty-all-NOTICE.txt => netty-buffer-NOTICE.txt} |    0
 solr/licenses/netty-codec-4.1.29.Final.jar.sha1    |    1 +
 .../netty-codec-LICENSE-ASL.txt}                   |    0
 ...netty-all-NOTICE.txt => netty-codec-NOTICE.txt} |    0
 solr/licenses/netty-common-4.1.29.Final.jar.sha1   |    1 +
 .../netty-common-LICENSE-ASL.txt}                  |    0
 ...etty-all-NOTICE.txt => netty-common-NOTICE.txt} |    0
 solr/licenses/netty-handler-4.1.29.Final.jar.sha1  |    1 +
 .../netty-handler-LICENSE-ASL.txt}                 |    0
 ...tty-all-NOTICE.txt => netty-handler-NOTICE.txt} |    0
 solr/licenses/netty-resolver-4.1.29.Final.jar.sha1 |    1 +
 .../netty-resolver-LICENSE-ASL.txt}                |    0
 ...ty-all-NOTICE.txt => netty-resolver-NOTICE.txt} |    0
 .../licenses/netty-transport-4.1.29.Final.jar.sha1 |    1 +
 .../netty-transport-LICENSE-ASL.txt}               |    0
 ...y-all-NOTICE.txt => netty-transport-NOTICE.txt} |    0
 ...ty-transport-native-epoll-4.1.29.Final.jar.sha1 |    1 +
 .../netty-transport-native-epoll-LICENSE-ASL.txt}  |    0
 ...txt => netty-transport-native-epoll-NOTICE.txt} |    0
 ...nsport-native-unix-common-4.1.29.Final.jar.sha1 |    1 +
 ...y-transport-native-unix-common-LICENSE-ASL.txt} |    0
 ... netty-transport-native-unix-common-NOTICE.txt} |    0
 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 +-
 solr/solr-ref-guide/src/json-facet-api.adoc        |    1 -
 .../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                                 |    9 +
 .../client/solrj/impl/BaseCloudSolrClient.java     |    7 +-
 .../solr/client/solrj/impl/CloudSolrClient.java    |    9 +-
 .../solrj/impl/SolrClientNodeStateProvider.java    |    2 +-
 .../org/apache/solr/client/solrj/io/Tuple.java     |    3 +-
 .../client/solrj/io/eval/CorrelationEvaluator.java |    3 +-
 .../client/solrj/io/eval/FuzzyKmeansEvaluator.java |    4 +-
 .../solrj/io/eval/NormalizeSumEvaluator.java       |    5 +-
 .../client/solrj/io/eval/RecursiveEvaluator.java   |    2 +-
 .../client/solrj/io/eval/SetValueEvaluator.java    |    3 +-
 .../client/solrj/io/eval/TermVectorsEvaluator.java |    3 +-
 .../client/solrj/io/eval/TopFeaturesEvaluator.java |    7 +-
 .../solr/client/solrj/io/eval/UnitEvaluator.java   |    7 +-
 .../client/solrj/io/graph/ShortestPathStream.java  |    3 +-
 .../solr/client/solrj/io/ops/GroupOperation.java   |    6 +-
 .../client/solrj/io/stream/CloudSolrStream.java    |    6 +-
 .../client/solrj/io/stream/DeepRandomStream.java   |    6 +-
 .../solrj/io/stream/FeaturesSelectionStream.java   |    4 +-
 .../solrj/io/stream/SignificantTermsStream.java    |   10 +-
 .../solr/client/solrj/io/stream/StatsStream.java   |    6 +-
 .../client/solrj/io/stream/TextLogitStream.java    |    4 +-
 .../solr/client/solrj/io/stream/ZplotStream.java   |    8 +-
 .../solrj/request/JavaBinUpdateRequestCodec.java   |   40 +-
 .../solr/client/solrj/request/beans/Package.java   |    3 +
 .../solrj/response/schema/SchemaResponse.java      |    9 +-
 .../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/ConditionalKeyMapWriter.java       |   88 ++
 .../org/apache/solr/common/SolrInputDocument.java  |    5 +
 .../solr/common}/cloud/NodesSysPropsCacher.java    |   18 +-
 .../apache/solr/common/params/CommonParams.java    |    4 +-
 .../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/JavaBinCodec.java  |   11 +-
 .../org/apache/solr/common/util/NamedList.java     |   11 +-
 .../apache/solr/common/util/ReflectMapWriter.java  |    2 +-
 .../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 +-
 .../client/solrj/impl/CloudSolrClientTest.java     |    2 +-
 .../org/apache/solr/client/solrj/io/TestLang.java  |   15 +-
 .../io/stream/eval/AbsoluteValueEvaluatorTest.java |    3 +-
 .../solrj/io/stream/eval/AddEvaluatorTest.java     |    3 +-
 .../solrj/io/stream/eval/AppendEvaluatorTest.java  |    3 +-
 .../solrj/io/stream/eval/ArrayEvaluatorTest.java   |    3 +-
 .../solrj/io/stream/eval/AscEvaluatorTest.java     |    3 +-
 .../solrj/io/stream/eval/CeilingEvaluatorTest.java |    3 +-
 .../io/stream/eval/CoalesceEvaluatorTest.java      |    3 +-
 .../solrj/io/stream/eval/DivideEvaluatorTest.java  |    3 +-
 .../solrj/io/stream/eval/FloorEvaluatorTest.java   |    3 +-
 .../solrj/io/stream/eval/ModuloEvaluatorTest.java  |    3 +-
 .../io/stream/eval/MultiplyEvaluatorTest.java      |    3 +-
 .../io/stream/eval/RecursiveEvaluatorTest.java     |    3 +-
 .../io/stream/eval/SubtractEvaluatorTest.java      |    3 +-
 .../solr/client/solrj/request/SchemaTest.java      |    8 +-
 .../solrj/request/TestUpdateRequestCodec.java      |  125 ++-
 .../solr/client/solrj/request/TestV2Request.java   |   18 +-
 ...ectJsonQueryRequestFacetingIntegrationTest.java |    4 +-
 .../JsonQueryRequestFacetingIntegrationTest.java   |    4 +-
 .../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 +-
 .../src/java/org/apache/solr/SolrTestCaseJ4.java   |    3 +-
 .../solr/cloud/AbstractFullDistribZkTestBase.java  |    7 +-
 .../apache/solr/cloud/MiniSolrCloudCluster.java    |    6 +-
 394 files changed, 7545 insertions(+), 3469 deletions(-)
 create mode 100644 lucene/core/src/java/org/apache/lucene/geo/Component2D.java
 create mode 100644 lucene/core/src/java/org/apache/lucene/geo/ComponentTree.java
 delete mode 100644 lucene/core/src/java/org/apache/lucene/search/BottomValueChecker.java
 create mode 100644 lucene/core/src/java/org/apache/lucene/search/MaxScoreAccumulator.java
 create mode 100644 lucene/core/src/test/org/apache/lucene/search/TestMaxScoreAccumulator.java
 create mode 100644 lucene/grouping/src/test/org/apache/lucene/search/grouping/TopGroupsTest.java
 rename solr/core/src/{test => java}/org/apache/solr/cloud/autoscaling/sim/FakeDocIterator.java (100%)
 create mode 100644 solr/core/src/java/org/apache/solr/cloud/autoscaling/sim/SimScenario.java
 create mode 100644 solr/core/src/java/org/apache/solr/metrics/SolrMetricsContext.java
 create mode 100644 solr/core/src/test/org/apache/solr/cloud/TestQueryingOnDownCollection.java
 create mode 100644 solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimScenario.java
 delete mode 100644 solr/licenses/asciidoctor-ant-1.6.0-alpha.5.jar.sha1
 create mode 100644 solr/licenses/asciidoctor-ant-1.6.2.jar.sha1
 delete mode 100644 solr/licenses/netty-all-4.0.52.Final.jar.sha1
 create mode 100644 solr/licenses/netty-all-4.1.29.Final.jar.sha1
 create mode 100644 solr/licenses/netty-buffer-4.1.29.Final.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/netty-buffer-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/licenses/{netty-all-NOTICE.txt => netty-buffer-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/netty-codec-4.1.29.Final.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/netty-codec-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/licenses/{netty-all-NOTICE.txt => netty-codec-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/netty-common-4.1.29.Final.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/netty-common-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/licenses/{netty-all-NOTICE.txt => netty-common-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/netty-handler-4.1.29.Final.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/netty-handler-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/licenses/{netty-all-NOTICE.txt => netty-handler-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/netty-resolver-4.1.29.Final.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/netty-resolver-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/licenses/{netty-all-NOTICE.txt => netty-resolver-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/netty-transport-4.1.29.Final.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/netty-transport-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/licenses/{netty-all-NOTICE.txt => netty-transport-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/netty-transport-native-epoll-4.1.29.Final.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/netty-transport-native-epoll-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/licenses/{netty-all-NOTICE.txt => netty-transport-native-epoll-NOTICE.txt} (100%)
 create mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.29.Final.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/netty-transport-native-unix-common-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 copy solr/licenses/{netty-all-NOTICE.txt => netty-transport-native-unix-common-NOTICE.txt} (100%)
 rename solr/{core/src/java/org/apache/solr/handler/component => solrj/src/java/org/apache/solr/client/solrj/routing}/AffinityReplicaListTransformer.java (86%)
 rename solr/{core/src/java/org/apache/solr/handler/component => solrj/src/java/org/apache/solr/client/solrj/routing}/AffinityReplicaListTransformerFactory.java (88%)
 create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/routing/NodePreferenceRulesComparator.java
 rename solr/solrj/src/java/org/apache/solr/client/solrj/{impl => routing}/PreferenceRule.java (97%)
 rename solr/{core/src/java/org/apache/solr/handler/component => solrj/src/java/org/apache/solr/client/solrj/routing}/ReplicaListTransformer.java (96%)
 rename solr/{core/src/java/org/apache/solr/handler/component => solrj/src/java/org/apache/solr/client/solrj/routing}/ReplicaListTransformerFactory.java (80%)
 create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/routing/RequestReplicaListTransformerGenerator.java
 rename solr/{core/src/java/org/apache/solr/handler/component => solrj/src/java/org/apache/solr/client/solrj/routing}/ShufflingReplicaListTransformer.java (89%)
 copy solr/{core/src/test/org/apache/solr/cloud/TestLRUStatsCacheCloud.java => solrj/src/java/org/apache/solr/client/solrj/routing/package-info.java} (70%)
 create mode 100644 solr/solrj/src/java/org/apache/solr/common/ConditionalKeyMapWriter.java
 rename solr/{core/src/java/org/apache/solr => solrj/src/java/org/apache/solr/common}/cloud/NodesSysPropsCacher.java (93%)
 copy solr/{core/src/test/org/apache/solr/cloud/TestLRUStatsCacheCloud.java => solrj/src/java/org/apache/solr/common/util/CommonTestInjection.java} (57%)
 create mode 100644 solr/solrj/src/test/org/apache/solr/client/solrj/routing/NodePreferenceRulesComparatorTest.java
 rename solr/{core/src/test/org/apache/solr/handler/component => solrj/src/test/org/apache/solr/client/solrj/routing}/ReplicaListTransformerTest.java (97%)
 create mode 100644 solr/solrj/src/test/org/apache/solr/client/solrj/routing/RequestReplicaListTransformerGeneratorTest.java
 rename solr/{core/src/test/org/apache/solr/handler/component => solrj/src/test/org/apache/solr/client/solrj/routing}/ShufflingReplicaListTransformerTest.java (98%)