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 2020/12/15 01:56:19 UTC

[lucene-solr] branch jira/solr14977-1 updated (38eaacf -> 2c9604b)

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

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


    from 38eaacf  syncing with master
     add 99c38ee  SOLR-14851 Http2SolrClient doesn't handle keystore type (#2098)
     add 1e0ae2f  SOLR-15001 Docker: require init_var_solr.sh (#2083)
     add 021de9f  SOLR-14915: Prometheus-exporter should not depend on Solr-core (#1972)
     add 2da3d1f  fix duplicate compute on maxUnpatchedValue (#2106)
     add 37a6163  SOLR-14958: Refactor zkHost config logic to make testing easier and reduce risk of incorrect value being used
     add cb5ba42  SOLR-15009 Propogate IOException from DF.exists
     add a049284  SOLR-12182: Don't persist base_url in ZK as the scheme is variable, compute from node_name instead (#2010)
     add 689e56f  Ref Guide: fix wrong class name in CSS to toggle the icon shown in sidebar nav when a section is open
     add 663655d  SOLR-15013: Prevent merges since test asserts doc order
     add 3df7250  SOLR-15004: tests for the replica placement API + placement plugin fixes and light refactoring (#2110)
     add feb897a  SOLR-15017: Core's lib/ dir was ignored sometimes (#2107)
     add d99c166  SOLR-14942: Move request registration to ContentStreamHandlerBase (#2112)
     add 2e6a023  SOLR-14934: Refactored duplicate "Solr Home" logic into a single place to eliminate risk of tests using divergent values for a single solr node.
     add 8732df8  SOLR-14934: test workaround for SOLR-15026
     add 05a8477  SOLR-14934: Fix some additional test helper methods that aren't used on master but triggered problems when when backporting to branch_8x
     add d50bdba  Remove obsolete dev-tools scripts (#2105)
     add e3572d0  Reconcile upgrade notes in master (#2103)
     add 5208d47  SOLR-14934: Remove redundent deprecated "solr.solr.home" logic
     add 4c100a0  SOLR-12182: Fix Changes.txt in master (#2116)
     add a9e180b  LUCENE-9631: Properly override slice() on subclasses of OffsetRange.
     add f24b497  LUCENE-9618: Do not call IntervalIterator.nextInterval after NO_MORE_DOCS returned (#2095)
     add 69de1a4  LUCENE-9599 Disable sort optim on index sort (#2075)
     add cef9281  SOLR-14992 Wait for node down before checking for node up (#2115)
     add 19ed903  SOLR-14965: add overseer queue size metrics (#2040)
     add 21b8890  SOLR: Remove CHANGES.md; use solr/CHANGES.txt
     add cced507  SOLR-15016: Replica placement plugins should use container plugins API / configs.
     add 478c6cb  SOLR-15016: Fix javadoc so that the example matches the current API.
     add 510f96c  SOLR-8673: Enable custom aggregate functions by opening up FacetContext
     add 8dcaa6c  SOLR-15022: Add RefGuide documentation for cluster plugins.
     add 637afad  SOLR-15022: fix page-children declaration.
     add 30e5e38  SOLR-14987: Reuse HttpSolrClient per node vs. one per Solr core when using CloudSolrStream (#2067)
     add 0f15b5e  Adding Apache Reporter step in Release Wizard. (#2130)
     add af3e122  LUCENE-9626 represent HNSW graph neighbors using primitive arrays (#2108)
     add 8200f89  reindent TestHnsw (was 4 indented spaces)
     add 04b9a98  SOLR-15040: Improvements to postlogs timestamp handling
     add ab0b17e  Fix indent from 4 to 2 spaces (#2129)
     add a95ce0d  SOLR-14827: Refactor schema loading to not use XPath (#1963)
     add a648143  LUCENE-9633: Improve match highlighter behavior for degenerate intervals (on non-existing positions). (#2127)
     add ccf3e60  LUCENE-9021 QueryParser: re-use the LookaheadSuccess exception (#962)
     add a2a811a  added a perf test
     add 63943a7  use RTimer
     add bc854b2  LUCENE-9552: make sure we don't construct Illegal rectangles due to quantization (#2131)
     add ecd47a8  LUCENE-9636: Exact and operation to get a SIMD optimize (#2139)
     add ecf1522  LUCENE-9636: Add CHANGES entry.
     add 2c9604b  Merge branch 'master' into jira/solr14977-1

No new revisions were added by this update.

Summary of changes:
 dev-tools/scripts/LUCENE-3753.patch.hack.pl        | 111 ----
 dev-tools/scripts/addVersion.py                    |   1 +
 dev-tools/scripts/crawl.maven.release.dist.sh      |  68 --
 dev-tools/scripts/gitignore-gen.sh                 |  21 -
 dev-tools/scripts/releaseWizard.yaml               |  10 +
 dev-tools/scripts/write.stage.maven.build.xml.pl   | 180 -----
 gradle/generation/javacc.gradle                    |   3 +
 gradle/solr/packaging.gradle                       |   3 +-
 lucene/CHANGES.txt                                 |  12 +
 lucene/NOTICE.txt                                  |   3 +
 .../org/apache/lucene/codecs/lucene84/ForUtil.java |  82 +--
 .../apache/lucene/codecs/lucene84/PForUtil.java    |   2 +-
 .../apache/lucene/codecs/lucene84/gen_ForUtil.py   |  28 +-
 .../codecs/lucene90/Lucene90VectorReader.java      |  12 +-
 .../codecs/lucene90/Lucene90VectorWriter.java      |   2 +-
 .../LatLonDocValuesPointInGeometryQuery.java       |  24 +-
 .../document/LatLonPointInGeometryQuery.java       |  16 +-
 .../org/apache/lucene/document/VectorField.java    |   3 +-
 .../org/apache/lucene/search/FieldComparator.java  |  11 +
 .../apache/lucene/search/LeafFieldComparator.java  |   2 +-
 .../apache/lucene/search/TopFieldCollector.java    |  56 +-
 .../lucene/search/comparators/DocComparator.java   | 270 ++++----
 .../search/comparators/DoubleComparator.java       | 138 ++--
 .../lucene/search/comparators/FloatComparator.java | 138 ++--
 .../lucene/search/comparators/IntComparator.java   | 142 ++--
 .../lucene/search/comparators/LongComparator.java  | 142 ++--
 .../lucene/search/comparators/MinDocIterator.java  |  64 +-
 .../search/comparators/NumericComparator.java      | 373 ++++++-----
 .../src/java/org/apache/lucene/util/LongHeap.java  | 247 +++++++
 .../java/org/apache/lucene/util/NumericUtils.java  |   1 -
 .../java/org/apache/lucene/util/VectorUtil.java    |  36 +-
 .../org/apache/lucene/util/hnsw/HnswGraph.java     | 102 ++-
 .../apache/lucene/util/hnsw/HnswGraphBuilder.java  |  28 +-
 .../java/org/apache/lucene/util/hnsw/Neighbor.java |  70 --
 .../org/apache/lucene/util/hnsw/Neighbors.java     | 115 ++--
 .../test/org/apache/lucene/index/TestKnnGraph.java |   6 +-
 .../org/apache/lucene/index/TestVectorValues.java  |  22 +-
 .../test/org/apache/lucene/util/TestLongHeap.java  | 248 +++++++
 .../org/apache/lucene/util/TestNumericUtils.java   |   1 +
 .../org/apache/lucene/util/TestVectorUtil.java     |  32 +-
 .../apache/lucene/util/hnsw/KnnGraphTester.java    |  14 +-
 .../test/org/apache/lucene/util/hnsw/TestHnsw.java | 737 ++++++++++-----------
 .../search/matchhighlight/MatchHighlighter.java    |   5 +
 .../matchhighlight/MatchRegionRetriever.java       |   2 +-
 .../matchhighlight/OffsetsFromPositions.java       |  88 +--
 .../lucene/search/matchhighlight/Passage.java      |   9 +
 .../matchhighlight/TestMatchRegionRetriever.java   |  52 +-
 .../intervals/ConjunctionIntervalIterator.java     |   8 +-
 .../lucene/queries/intervals/IntervalIterator.java |   6 +
 .../queries/intervals/OneTimeIntervalSource.java   | 189 ++++++
 .../queries/intervals/TestIntervalQuery.java       |   6 +
 .../lucene/queryparser/classic/QueryParser.java    |   2 +-
 solr/CHANGES.txt                                   |  69 +-
 .../apache/solr/ltr/TestLTRReRankingPipeline.java  |   3 +-
 .../org/apache/solr/ltr/TestLTRScoringQuery.java   |   3 +-
 .../test/org/apache/solr/ltr/TestRerankBase.java   |   3 +-
 .../apache/solr/ltr/norm/TestMinMaxNormalizer.java |   5 +-
 .../solr/ltr/norm/TestStandardNormalizer.java      |   5 +-
 solr/contrib/prometheus-exporter/bin/solr-exporter |  15 -
 .../prometheus-exporter/bin/solr-exporter.cmd      |   5 +-
 solr/contrib/prometheus-exporter/build.gradle      |  51 +-
 solr/contrib/prometheus-exporter/conf/log4j2.xml   |  40 ++
 .../conf/solr-exporter-config.xml                  |  34 +
 .../prometheus/exporter/MetricsConfiguration.java  |  72 +-
 .../solr/prometheus/exporter/SolrExporter.java     |  15 +-
 .../solr/prometheus/scraper/SolrCloudScraper.java  |  16 +-
 .../org/apache/solr/prometheus/utils/Helpers.java  |  13 +-
 .../org/apache/solr/api/ConfigurablePlugin.java    |   4 +-
 .../apache/solr/api/ContainerPluginsRegistry.java  |   6 +-
 .../apache/solr/cloud/CloudConfigSetService.java   |  34 +-
 .../src/java/org/apache/solr/cloud/CloudUtil.java  |   3 +-
 .../src/java/org/apache/solr/cloud/Overseer.java   |  16 +-
 .../OverseerCollectionConfigSetProcessor.java      |  11 +-
 .../apache/solr/cloud/OverseerTaskProcessor.java   |  21 +-
 .../org/apache/solr/cloud/RecoveryStrategy.java    |  13 +-
 .../solr/cloud/ShardLeaderElectionContextBase.java |   4 +-
 .../java/org/apache/solr/cloud/ZkController.java   |  23 +-
 .../apache/solr/cloud/ZkSolrResourceLoader.java    |   7 +-
 .../solr/cloud/api/collections/AddReplicaCmd.java  |  17 +-
 .../apache/solr/cloud/api/collections/Assign.java  |  16 +-
 .../cloud/api/collections/CreateCollectionCmd.java |  15 +-
 .../OverseerCollectionMessageHandler.java          |  14 +-
 .../solr/cloud/api/collections/ReplaceNodeCmd.java |   4 +-
 .../solr/cloud/api/collections/RestoreCmd.java     |   4 +-
 .../solr/cloud/api/collections/SplitShardCmd.java  |   5 +-
 .../apache/solr/cloud/overseer/SliceMutator.java   |  18 +-
 .../src/java/org/apache/solr/cluster/Replica.java  |  12 +-
 .../org/apache/solr/cluster/SolrCollection.java    |  33 +-
 .../solr/cluster/events/ClusterEventProducer.java  |   2 +-
 .../events/impl/ClusterEventProducerFactory.java   |  34 +-
 .../impl/CollectionsRepairEventListener.java       |  31 +-
 .../solr/cluster/placement/AttributeFetcher.java   |  49 +-
 .../solr/cluster/placement/AttributeValues.java    |  60 +-
 .../solr/cluster/placement/PlacementPlan.java      |   2 +-
 .../solr/cluster/placement/PlacementPlugin.java    |  14 +-
 .../cluster/placement/PlacementPluginConfig.java   | 101 +--
 .../cluster/placement/PlacementPluginFactory.java  |  46 +-
 .../solr/cluster/placement/PlacementRequest.java   |  54 +-
 .../placement/impl/AttributeFetcherImpl.java       | 376 +++++------
 .../placement/impl/AttributeValuesImpl.java        | 146 ++--
 .../impl/DelegatingPlacementPluginFactory.java     |  53 ++
 .../placement/impl/PlacementPlanFactoryImpl.java   |  21 +-
 .../cluster/placement/impl/PlacementPlanImpl.java  |  10 +
 .../impl/PlacementPluginAssignStrategy.java        |   4 +-
 .../placement/impl/PlacementPluginConfigImpl.java  | 204 ------
 .../impl/PlacementPluginFactoryLoader.java         |  79 +++
 .../placement/impl/PlacementRequestImpl.java       |  18 +-
 .../placement/impl/ReplicaPlacementImpl.java       |   5 +
 .../impl/SimpleClusterAbstractionsImpl.java        | 120 ++--
 .../placement/plugins/AffinityPlacementConfig.java |  56 ++
 .../plugins/AffinityPlacementFactory.java          | 567 ++++++++++++++++
 .../plugins/MinimizeCoresPlacementFactory.java     | 126 ++++
 .../placement/plugins/RandomPlacementFactory.java  |  93 +++
 .../SamplePluginAffinityReplicaPlacement.java      | 509 --------------
 .../plugins/SamplePluginMinimizeCores.java         | 138 ----
 .../plugins/SamplePluginRandomPlacement.java       |  88 ---
 .../cluster/placement/plugins/package-info.java    |   2 +-
 .../java/org/apache/solr/core/BlobRepository.java  |   3 +-
 .../apache/solr/core/CachingDirectoryFactory.java  |  15 +-
 .../src/java/org/apache/solr/core/CloudConfig.java |   2 +-
 .../org/apache/solr/core/ConfigSetService.java     |  30 +-
 .../java/org/apache/solr/core/CoreContainer.java   |  16 +-
 .../src/java/org/apache/solr/core/NodeConfig.java  |  38 +-
 .../src/java/org/apache/solr/core/SolrConfig.java  |  68 +-
 .../src/java/org/apache/solr/core/SolrPaths.java   |  59 --
 .../org/apache/solr/core/SolrResourceLoader.java   |  20 +-
 .../java/org/apache/solr/core/SolrXmlConfig.java   |  49 +-
 .../apache/solr/core/StandardDirectoryFactory.java |  15 +-
 .../java/org/apache/solr/core/XmlConfigFile.java   |  28 +-
 .../src/java/org/apache/solr/core/ZkContainer.java |  19 +-
 .../java/org/apache/solr/handler/ClusterAPI.java   |  22 -
 .../solr/handler/ContentStreamHandlerBase.java     |  65 +-
 .../apache/solr/handler/admin/ClusterStatus.java   |  26 +-
 .../solr/handler/admin/ContainerPluginsApi.java    |   2 +-
 .../solr/handler/admin/MetricsHistoryHandler.java  |   3 +-
 .../solr/handler/admin/RebalanceLeaders.java       |   2 +-
 .../solr/handler/admin/RequestSyncShardOp.java     |   1 -
 .../solr/handler/admin/ZookeeperInfoHandler.java   |  10 +-
 .../apache/solr/schema/FieldTypePluginLoader.java  |  83 +--
 .../java/org/apache/solr/schema/IndexSchema.java   | 175 ++---
 .../org/apache/solr/schema/IndexSchemaFactory.java |  68 +-
 .../org/apache/solr/schema/ManagedIndexSchema.java |   7 +-
 .../solr/schema/ManagedIndexSchemaFactory.java     |  17 +-
 .../java/org/apache/solr/schema/SchemaManager.java |   6 +-
 .../apache/solr/schema/ZkIndexSchemaReader.java    |  21 +-
 .../org/apache/solr/search/SolrCoreParser.java     |  13 +-
 .../org/apache/solr/search/facet/FacetContext.java |  36 +
 .../java/org/apache/solr/search/facet/SlotAcc.java |  20 +-
 .../java/org/apache/solr/servlet/HttpSolrCall.java |  82 +--
 .../apache/solr/servlet/SolrDispatchFilter.java    | 163 +++--
 .../java/org/apache/solr/util/DOMConfigNode.java   |  89 +++
 .../java/org/apache/solr/util/DataConfigNode.java  | 132 ++++
 .../src/java/org/apache/solr/util/SolrCLI.java     |   2 +
 .../java/org/apache/solr/util/SolrLogPostTool.java |  33 +-
 .../solr/util/plugin/AbstractPluginLoader.java     |  19 +-
 .../apache/solr/util/plugin/MapPluginLoader.java   |   6 +-
 .../solr/util/plugin/NamedListPluginLoader.java    |   4 +-
 .../bad-schema-daterangefield-instance-options.xml |   1 -
 .../test/org/apache/solr/TestRandomDVFaceting.java |   1 +
 .../solr/cloud/ClusterStateMockUtilTest.java       |   1 +
 .../org/apache/solr/cloud/DeleteReplicaTest.java   |   6 +-
 .../org/apache/solr/cloud/LeaderElectionTest.java  |  32 +-
 .../org/apache/solr/cloud/NodeMutatorTest.java     |   2 +
 .../OverseerCollectionConfigSetProcessorTest.java  |  28 +-
 .../test/org/apache/solr/cloud/OverseerTest.java   |  74 +--
 .../cloud/TestLeaderElectionWithEmptyReplica.java  |   4 +-
 .../solr/cloud/TestMiniSolrCloudClusterSSL.java    |   3 +
 .../solr/cloud/TestPullReplicaErrorHandling.java   |   4 +-
 .../solr/cloud/TestRandomRequestDistribution.java  |   5 +-
 .../org/apache/solr/cloud/ZkControllerTest.java    |  11 +-
 .../CollectionsAPIDistributedZkTest.java           |   5 +-
 .../solr/cloud/api/collections/ShardSplitTest.java |   5 +-
 .../cluster/placement/AttributeFetcherForTest.java |  93 +++
 .../apache/solr/cluster/placement/Builders.java    | 452 +++++++++++++
 .../placement/ClusterAbstractionsForTest.java      | 316 +++++++++
 .../impl/PlacementPluginIntegrationTest.java       | 239 +++++++
 .../impl/SimpleClusterAbstractionsTest.java        |  89 +++
 .../plugins/AffinityPlacementFactoryTest.java      | 730 ++++++++++++++++++++
 .../org/apache/solr/core/ResourceLoaderTest.java   |   7 +-
 .../org/apache/solr/core/TestCoreContainer.java    |  22 +
 .../org/apache/solr/core/TestCoreDiscovery.java    |   3 +-
 .../org/apache/solr/core/TestMinimalConfig.java    |  45 ++
 .../core/snapshots/TestSolrCloudSnapshots.java     |  13 +-
 .../solr/core/snapshots/TestSolrCoreSnapshots.java |   6 +-
 .../org/apache/solr/handler/TestBlobHandler.java   |   3 +-
 .../org/apache/solr/handler/TestConfigReload.java  |   2 +-
 .../solr/handler/TestHdfsBackupRestoreCore.java    |   7 +-
 .../org/apache/solr/handler/TestReqParamsAPI.java  |   2 +-
 .../solr/handler/TestSolrConfigHandlerCloud.java   |   4 +-
 .../handler/TestSolrConfigHandlerConcurrent.java   |   2 +-
 .../handler/component/CloudReplicaSourceTest.java  |   1 +
 .../solr/index/WrapperMergePolicyFactoryTest.java  |   2 +-
 .../apache/solr/index/hdfs/CheckHdfsIndexTest.java |   2 +
 .../apache/solr/metrics/SolrMetricManagerTest.java |  94 +--
 .../solr/schema/TestManagedSchemaThreadSafety.java |   8 +-
 .../org/apache/solr/schema/TestSchemaManager.java  |  17 +
 .../org/apache/solr/search/TestSolrCoreParser.java |  14 +-
 .../org/apache/solr/search/TestXmlQParser.java     |  18 +-
 .../solr/search/function/AggValueSourceTest.java   | 106 +++
 .../security/MultiDestinationAuditLoggerTest.java  |   5 +-
 .../solr/uninverting/TestFieldCacheSort.java       |   3 +-
 .../apache/solr/update/SolrCmdDistributorTest.java |  25 +-
 .../org/apache/solr/util/SolrLogPostToolTest.java  |  26 +-
 solr/dev-docs/plugins/container-plugins.adoc       | 143 ----
 solr/docker/Dockerfile                             |   6 +-
 solr/docker/include/scripts/docker-entrypoint.sh   |   3 +
 solr/docker/include/scripts/init-var-solr          |  16 +-
 solr/docker/include/scripts/solr-create            |   3 -
 solr/docker/include/scripts/solr-foreground        |   3 -
 solr/docker/include/scripts/solr-precreate         |   3 -
 .../cases/empty-varsolr-vol-solr-nocopy/test.sh    |   1 +
 solr/solr-ref-guide/src/cluster-plugins.adoc       | 242 +++++++
 solr/solr-ref-guide/src/css/navs.css               |   2 +-
 solr/solr-ref-guide/src/enabling-ssl.adoc          |   2 +
 solr/solr-ref-guide/src/metrics-reporting.adoc     |   6 +
 solr/solr-ref-guide/src/solr-plugins.adoc          |   7 +-
 solr/solr-ref-guide/src/solr-upgrade-notes.adoc    |  22 +-
 .../client/solrj/impl/BaseCloudSolrClient.java     |   8 +-
 .../solr/client/solrj/impl/Http2SolrClient.java    |   8 +
 .../solr/client/solrj/io/SolrClientCache.java      |   2 +
 .../client/solrj/io/stream/CloudSolrStream.java    |  96 ++-
 .../solr/client/solrj/io/stream/SolrStream.java    |  27 +-
 .../solr/client/solrj/io/stream/TupleStream.java   | 128 ++--
 .../client/solrj/request/beans/PluginMeta.java     |   2 +
 .../org/apache/solr/cluster/api/SimpleMap.java     |   5 +
 .../java/org/apache/solr/common/ConfigNode.java    | 104 +++
 .../solr/common/cloud/ClusterProperties.java       |   8 +-
 .../apache/solr/common/cloud/ClusterStateUtil.java |   2 +-
 .../java/org/apache/solr/common/cloud/Replica.java |  22 +-
 .../org/apache/solr/common/cloud/UrlScheme.java    |  73 ++
 .../apache/solr/common/cloud/ZkCoreNodeProps.java  |  27 +-
 .../org/apache/solr/common/cloud/ZkNodeProps.java  |  54 +-
 .../apache/solr/common/cloud/ZkStateReader.java    |  25 +-
 .../java/org/apache/solr/common/util/DOMUtil.java  | 107 ++-
 .../apache/solr/common/util/PropertiesUtil.java    |  10 +-
 .../solrj/impl/CloudHttp2SolrClientTest.java       |  13 +-
 .../client/solrj/impl/CloudSolrClientTest.java     |  14 +-
 .../client/solrj/impl/Http2SolrClientTest.java     |   6 +
 .../solr/client/solrj/io/stream/StreamingTest.java |  60 ++
 .../client/solrj/response/QueryResponseTest.java   |  11 +-
 .../solrj/response/TestClusteringResponse.java     |   3 +-
 .../routing/NodePreferenceRulesComparatorTest.java |  45 +-
 ...RequestReplicaListTransformerGeneratorTest.java |  64 +-
 .../ShufflingReplicaListTransformerTest.java       |   4 +-
 .../apache/solr/common/cloud/UrlSchemeTest.java    |  56 ++
 .../apache/solr/common/util/ContentStreamTest.java |  19 +-
 .../src/java/org/apache/solr/SolrTestCaseJ4.java   |  12 +-
 .../solr/cloud/AbstractFullDistribZkTestBase.java  |  22 +-
 .../apache/solr/cloud/MiniSolrCloudCluster.java    |  26 +-
 .../src/java/org/apache/solr/util/TestHarness.java |  32 +-
 .../solr/cloud/MiniSolrCloudClusterTest.java       | 111 ++++
 251 files changed, 8669 insertions(+), 4583 deletions(-)
 delete mode 100644 dev-tools/scripts/LUCENE-3753.patch.hack.pl
 delete mode 100755 dev-tools/scripts/crawl.maven.release.dist.sh
 delete mode 100755 dev-tools/scripts/gitignore-gen.sh
 delete mode 100755 dev-tools/scripts/write.stage.maven.build.xml.pl
 create mode 100644 lucene/core/src/java/org/apache/lucene/util/LongHeap.java
 delete mode 100644 lucene/core/src/java/org/apache/lucene/util/hnsw/Neighbor.java
 create mode 100644 lucene/core/src/test/org/apache/lucene/util/TestLongHeap.java
 create mode 100644 lucene/queries/src/test/org/apache/lucene/queries/intervals/OneTimeIntervalSource.java
 create mode 100644 solr/contrib/prometheus-exporter/conf/log4j2.xml
 create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/impl/DelegatingPlacementPluginFactory.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/impl/PlacementPluginConfigImpl.java
 create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/impl/PlacementPluginFactoryLoader.java
 create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/plugins/AffinityPlacementConfig.java
 create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactory.java
 create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/plugins/MinimizeCoresPlacementFactory.java
 create mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/plugins/RandomPlacementFactory.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/plugins/SamplePluginAffinityReplicaPlacement.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/plugins/SamplePluginMinimizeCores.java
 delete mode 100644 solr/core/src/java/org/apache/solr/cluster/placement/plugins/SamplePluginRandomPlacement.java
 create mode 100644 solr/core/src/java/org/apache/solr/util/DOMConfigNode.java
 create mode 100644 solr/core/src/java/org/apache/solr/util/DataConfigNode.java
 create mode 100644 solr/core/src/test/org/apache/solr/cluster/placement/AttributeFetcherForTest.java
 create mode 100644 solr/core/src/test/org/apache/solr/cluster/placement/Builders.java
 create mode 100644 solr/core/src/test/org/apache/solr/cluster/placement/ClusterAbstractionsForTest.java
 create mode 100644 solr/core/src/test/org/apache/solr/cluster/placement/impl/PlacementPluginIntegrationTest.java
 create mode 100644 solr/core/src/test/org/apache/solr/cluster/placement/impl/SimpleClusterAbstractionsTest.java
 create mode 100644 solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java
 create mode 100644 solr/core/src/test/org/apache/solr/core/TestMinimalConfig.java
 create mode 100644 solr/core/src/test/org/apache/solr/search/function/AggValueSourceTest.java
 delete mode 100644 solr/dev-docs/plugins/container-plugins.adoc
 create mode 100644 solr/solr-ref-guide/src/cluster-plugins.adoc
 create mode 100644 solr/solrj/src/java/org/apache/solr/common/ConfigNode.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/common/cloud/UrlScheme.java
 create mode 100644 solr/solrj/src/test/org/apache/solr/common/cloud/UrlSchemeTest.java