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 2019/03/06 08:54:03 UTC

[lucene-solr] branch jira/solr-11127-2 updated (13a1a7b -> 1a01235)

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

ab pushed a change to branch jira/solr-11127-2
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.


    from 13a1a7b  SOLR-11127: More tests.
     add dcb022b  SOLR-10436: Add hashRollup Streaming Expression
     add f9b3004  SOLR-10436: Update CHANGES.txt
     add 02f1773  Lucene and Solr 7.7.1 release, DOAP changes
     add 5e28e94  fix AfterClass in OverseerTest to not fail with NPE if assumeWorkingMockito() call short circuited the BeforeClass
     add 3ae52e1  SOLR-13282: JDBCStreamTest should use assertEquals(double, double, delta) instead of '==' to compare 2 double values
     add 15dd4a1  UCENE-8703: Build point writers in the BKD tree only when they are needed
     add d381b73  LUCENE-8709: Set pointWriter to null when size of the HeapPointWriter is 0
     add 7ad0ac0  LUCENE-8714: Don't use NoMergePolicy in norms tests
     add fed8059  SOLR-12923: increase all await() times in TestSimTriggerIntegration
     add 1f9c767  SOLR-13234: Prometheus Metric Exporter not threadsafe.
     add e99934b  SOLR-13276: Adding Http2 equivalent classes of CloudSolrClient and HttpClusterStateProvider
     add a940c40  Add 7.7.1 back compat test indexes
     add b8d569a  SOLR-9882: reporting timeAllowed breach as partialResults instead of 500 error
     add 3b326e6  SOLR-13256: Add ref-guide upgrade notes for 7.7
     add f4f3277  SOLR-13276: Move change entry to 8.1
     add 235b15a  SOLR-12923: increase all await() times in TriggerIntegrationTest
     add 7f73576  SOLR-12923: harden testEventQueue by replacing the arbitrary sleep call with a countdown latch
     add 876fcb7  SOLR-13259: Add new section on Reindexing in Solr (#594)
     add 7771d7b  SOLR-13285: Updates with enum fields and javabin cause ClassCastException
     add 7bfe7b2  SOLR-13294: refactor test to include more loging to help diagnose some windows jenkins failures
     add c34c56b  SOLR-13287: Allow zplot to visualize probability distributions in Apache Zeppelin
     add 3438240  SOLR-13287: Update CHANGES.txt
     add 0bc26d0  SOLR-13271: Read-only mode for SolrCloud collections.
     new 1a01235  Merge branch 'master' into jira/solr-11127-2

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 dev-tools/doap/lucene.rdf                          |    7 +
 dev-tools/doap/solr.rdf                            |    7 +
 lucene/CHANGES.txt                                 |    3 +
 .../lucene/index/TestBackwardsCompatibility.java   |    4 +-
 .../apache/lucene/index/unsupported.7.7.1-cfs.zip  |  Bin 0 -> 15615 bytes
 .../lucene/index/unsupported.7.7.1-nocfs.zip       |  Bin 0 -> 15606 bytes
 .../codecs/simpletext/SimpleTextBKDWriter.java     |   93 +-
 .../java/org/apache/lucene/util/bkd/BKDWriter.java |   78 +-
 .../apache/lucene/util/bkd/HeapPointReader.java    |    2 +-
 .../apache/lucene/util/bkd/HeapPointWriter.java    |   10 +-
 .../test/org/apache/lucene/util/bkd/TestBKD.java   |   12 +-
 .../lucene/index/BaseNormsFormatTestCase.java      |    2 +-
 solr/CHANGES.txt                                   |   19 +
 ...package-info.java => CollectionsCollector.java} |   23 +-
 .../{package-info.java => MetricCollector.java}    |    7 +-
 .../solr/prometheus/collector/MetricSamples.java   |   73 ++
 .../{package-info.java => MetricsCollector.java}   |   29 +-
 .../collector/MetricsCollectorFactory.java         |   72 ++
 .../{package-info.java => PingCollector.java}      |   31 +-
 .../collector/SchedulerMetricsCollector.java       |  131 +++
 .../{package-info.java => SearchCollector.java}    |   23 +-
 .../solr/prometheus/collector/SolrCollector.java   |  463 --------
 .../solr/prometheus/collector/package-info.java    |    4 +-
 ...ge-info.java => CachedPrometheusCollector.java} |   24 +-
 .../prometheus/exporter/MetricsConfiguration.java  |   94 ++
 .../solr/prometheus/exporter/MetricsQuery.java     |  137 +++
 .../exporter/PrometheusExporterSettings.java       |   96 ++
 .../prometheus/exporter/SolrClientFactory.java     |   78 ++
 .../solr/prometheus/exporter/SolrExporter.java     |  266 ++---
 .../exporter/SolrScrapeConfiguration.java          |   59 +
 .../solr/prometheus/exporter/package-info.java     |    4 +-
 .../org/apache/solr/prometheus/scraper/Async.java  |   60 +
 .../solr/prometheus/scraper/SolrCloudScraper.java  |  154 +++
 .../solr/prometheus/scraper/SolrScraper.java       |  269 ++---
 .../prometheus/scraper/SolrStandaloneScraper.java  |  107 ++
 .../solr/prometheus/scraper/package-info.java      |    4 +-
 ...heus-solr-exporter-integration-test-config.xml} |  164 +--
 ...rometheus-solr-exporter-scraper-test-config.xml |  162 +++
 .../collection1/conf/managed-schema                |    0
 .../collection1/conf/solrconfig.xml                |   22 +-
 .../collection1/conf/stopwords.txt                 |    0
 .../collection1/conf/synonyms.txt                  |    0
 .../src/test-files/solr/solr.xml                   |    0
 ...stBase.java => PrometheusExporterTestBase.java} |   56 +-
 .../prometheus/collector/MetricSamplesTest.java    |  100 ++
 .../prometheus/collector/SolrCollectorTest.java    |   94 --
 .../exporter/SolrExporterIntegrationTest.java      |   98 ++
 .../solr/prometheus/exporter/SolrExporterTest.java |   99 --
 .../prometheus/exporter/SolrExporterTestBase.java  |  121 +-
 .../apache/solr/prometheus/scraper/AsyncTest.java  |   78 ++
 .../prometheus/scraper/SolrCloudScraperTest.java   |  205 ++++
 .../scraper/SolrStandaloneScraperTest.java         |  152 +++
 .../org/apache/solr/prometheus/utils/Helpers.java  |   56 +
 .../client/solrj/embedded/JettySolrRunner.java     |   20 +-
 .../java/org/apache/solr/core/CoreContainer.java   |    6 +-
 .../src/java/org/apache/solr/core/SolrCore.java    |    3 +-
 .../apache/solr/handler/RequestHandlerBase.java    |    5 +-
 .../solr/handler/component/FacetComponent.java     |   12 +
 .../solr/handler/component/QueryComponent.java     |   33 +-
 .../solr/handler/component/ResponseBuilder.java    |    7 +-
 .../solr/handler/component/SearchHandler.java      |   21 +-
 .../java/org/apache/solr/request/SimpleFacets.java |    7 +-
 .../apache/solr/response/BasicResultContext.java   |    1 +
 .../org/apache/solr/search/SolrIndexSearcher.java  |    2 +-
 .../org/apache/solr/search/facet/FacetModule.java  |   14 +-
 .../org/apache/solr/search/facet/FacetRequest.java |    9 +-
 .../SearchGroupShardResponseProcessor.java         |    4 +-
 .../TopGroupsShardResponseProcessor.java           |    4 +-
 .../apache/solr/update/DefaultSolrCoreState.java   |    2 +-
 .../processor/DistributedUpdateProcessor.java      |    4 +-
 .../configsets/exitable-directory/conf/schema.xml  |    1 +
 .../exitable-directory/conf/solrconfig.xml         |   79 +-
 .../cloud/CloudExitableDirectoryReaderTest.java    |  185 ++-
 .../test/org/apache/solr/cloud/OverseerTest.java   |    9 +-
 .../solr/cloud/TrollingIndexReaderFactory.java     |  229 ++++
 .../cloud/autoscaling/TriggerIntegrationTest.java  |  118 +-
 .../autoscaling/sim/TestSimTriggerIntegration.java |  238 ++--
 .../org/apache/solr/handler/TestSQLHandler.java    |  289 ++---
 solr/solr-ref-guide/src/collections-api.adoc       |   28 +
 solr/solr-ref-guide/src/docvalues.adoc             |    4 +-
 .../src/indexing-and-basic-data-operations.adoc    |    4 +-
 .../src/major-changes-in-solr-7.adoc               |    8 +-
 solr/solr-ref-guide/src/managed-resources.adoc     |    2 +-
 ...onitoring-solr-with-prometheus-and-grafana.adoc |    3 +
 solr/solr-ref-guide/src/reindexing.adoc            |  191 ++++
 solr/solr-ref-guide/src/schema-api.adoc            |   12 +-
 .../src/shards-and-indexing-data-in-solrcloud.adoc |    2 +-
 solr/solr-ref-guide/src/solr-tutorial.adoc         |    6 +-
 solr/solr-ref-guide/src/solr-upgrade-notes.adoc    |   20 +
 .../src/updating-parts-of-documents.adoc           |    4 +-
 ...oudSolrClient.java => BaseCloudSolrClient.java} |  640 +++--------
 ...ider.java => BaseHttpClusterStateProvider.java} |   83 +-
 .../solr/client/solrj/impl/BaseHttpSolrClient.java |   80 ++
 .../client/solrj/impl/CloudHttp2SolrClient.java    |  237 ++++
 .../solr/client/solrj/impl/CloudSolrClient.java    | 1186 +-------------------
 .../solrj/impl/Http2ClusterStateProvider.java      |   46 +
 .../solr/client/solrj/impl/Http2SolrClient.java    |   83 +-
 .../solrj/impl/HttpClusterStateProvider.java       |  301 +----
 .../solr/client/solrj/impl/HttpSolrClient.java     |   52 +-
 .../java/org/apache/solr/client/solrj/io/Lang.java |    1 +
 .../io/eval/EmpiricalDistributionEvaluator.java    |   24 +-
 .../client/solrj/io/stream/HashRollupStream.java   |  256 +++++
 .../solr/client/solrj/io/stream/TupStream.java     |   45 +-
 .../solr/client/solrj/io/stream/ZplotStream.java   |  106 +-
 .../client/solrj/io/stream/metrics/MaxMetric.java  |   16 +-
 .../client/solrj/io/stream/metrics/MeanMetric.java |   10 +-
 .../client/solrj/io/stream/metrics/MinMetric.java  |   16 +-
 .../client/solrj/io/stream/metrics/SumMetric.java  |    8 +-
 .../solr/client/solrj/request/UpdateRequest.java   |   76 +-
 .../apache/solr/common/cloud/DocCollection.java    |    8 +-
 .../org/apache/solr/common/util/JavaBinCodec.java  |    4 +-
 .../impl/CloudHttp2SolrClientBadInputTest.java     |   73 ++
 .../impl/CloudHttp2SolrClientBuilderTest.java      |   84 ++
 .../CloudHttp2SolrClientMultiConstructorTest.java  |   85 ++
 .../solrj/impl/CloudHttp2SolrClientRetryTest.java  |   83 ++
 .../solrj/impl/CloudHttp2SolrClientTest.java       |  978 ++++++++++++++++
 .../solrj/impl/CloudSolrClientCacheTest.java       |    2 +-
 .../org/apache/solr/client/solrj/io/TestLang.java  |    2 +-
 .../client/solrj/io/stream/JDBCStreamTest.java     |   22 +-
 .../client/solrj/io/stream/MathExpressionTest.java |  139 ++-
 .../solrj/io/stream/StreamDecoratorTest.java       |  274 +++++
 .../apache/solr/common/util/TestJavaBinCodec.java  |   22 +
 .../src/java/org/apache/solr/SolrTestCaseJ4.java   |   56 +
 .../apache/solr/cloud/MiniSolrCloudCluster.java    |   61 +-
 .../org/apache/solr/cloud/SolrCloudTestCase.java   |    8 +-
 125 files changed, 6619 insertions(+), 3986 deletions(-)
 create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.7.1-cfs.zip
 create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/unsupported.7.7.1-nocfs.zip
 copy solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/{package-info.java => CollectionsCollector.java} (61%)
 copy solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/{package-info.java => MetricCollector.java} (91%)
 create mode 100644 solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricSamples.java
 copy solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/{package-info.java => MetricsCollector.java} (56%)
 create mode 100644 solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/MetricsCollectorFactory.java
 copy solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/{package-info.java => PingCollector.java} (52%)
 create mode 100644 solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SchedulerMetricsCollector.java
 copy solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/{package-info.java => SearchCollector.java} (61%)
 delete mode 100644 solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/collector/SolrCollector.java
 copy solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/{package-info.java => CachedPrometheusCollector.java} (63%)
 create mode 100644 solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsConfiguration.java
 create mode 100644 solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/MetricsQuery.java
 create mode 100644 solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/PrometheusExporterSettings.java
 create mode 100644 solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrClientFactory.java
 create mode 100644 solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/exporter/SolrScrapeConfiguration.java
 create mode 100644 solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/Async.java
 create mode 100644 solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrCloudScraper.java
 create mode 100644 solr/contrib/prometheus-exporter/src/java/org/apache/solr/prometheus/scraper/SolrStandaloneScraper.java
 rename solr/contrib/prometheus-exporter/src/test-files/conf/{solr-exporter-config.xml => prometheus-solr-exporter-integration-test-config.xml} (96%)
 create mode 100644 solr/contrib/prometheus-exporter/src/test-files/conf/prometheus-solr-exporter-scraper-test-config.xml
 rename solr/contrib/prometheus-exporter/src/test-files/{configsets => solr}/collection1/conf/managed-schema (100%)
 rename solr/contrib/prometheus-exporter/src/test-files/{configsets => solr}/collection1/conf/solrconfig.xml (91%)
 rename solr/contrib/prometheus-exporter/src/test-files/{configsets => solr}/collection1/conf/stopwords.txt (100%)
 rename solr/contrib/prometheus-exporter/src/test-files/{configsets => solr}/collection1/conf/synonyms.txt (100%)
 copy solr/contrib/{ltr => prometheus-exporter}/src/test-files/solr/solr.xml (100%)
 copy solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/{exporter/SolrExporterTestBase.java => PrometheusExporterTestBase.java} (55%)
 create mode 100644 solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/collector/MetricSamplesTest.java
 delete mode 100644 solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/collector/SolrCollectorTest.java
 create mode 100644 solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterIntegrationTest.java
 delete mode 100644 solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTest.java
 create mode 100644 solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/AsyncTest.java
 create mode 100644 solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrCloudScraperTest.java
 create mode 100644 solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/scraper/SolrStandaloneScraperTest.java
 create mode 100644 solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/utils/Helpers.java
 create mode 100644 solr/core/src/test/org/apache/solr/cloud/TrollingIndexReaderFactory.java
 create mode 100644 solr/solr-ref-guide/src/reindexing.adoc
 copy solr/solrj/src/java/org/apache/solr/client/solrj/impl/{CloudSolrClient.java => BaseCloudSolrClient.java} (68%)
 copy solr/solrj/src/java/org/apache/solr/client/solrj/impl/{HttpClusterStateProvider.java => BaseHttpClusterStateProvider.java} (78%)
 create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/impl/BaseHttpSolrClient.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudHttp2SolrClient.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2ClusterStateProvider.java
 create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/HashRollupStream.java
 create mode 100644 solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientBadInputTest.java
 create mode 100644 solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientBuilderTest.java
 create mode 100644 solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientMultiConstructorTest.java
 create mode 100644 solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientRetryTest.java
 create mode 100644 solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudHttp2SolrClientTest.java


[lucene-solr] 01/01: Merge branch 'master' into jira/solr-11127-2

Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ab pushed a commit to branch jira/solr-11127-2
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 1a012355ec2ef72b7d0100cf9922369e7d7e2632
Merge: 13a1a7b 0bc26d0
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Tue Mar 5 18:01:24 2019 +0100

    Merge branch 'master' into jira/solr-11127-2

 dev-tools/doap/lucene.rdf                          |    7 +
 dev-tools/doap/solr.rdf                            |    7 +
 lucene/CHANGES.txt                                 |    3 +
 .../lucene/index/TestBackwardsCompatibility.java   |    4 +-
 .../apache/lucene/index/unsupported.7.7.1-cfs.zip  |  Bin 0 -> 15615 bytes
 .../lucene/index/unsupported.7.7.1-nocfs.zip       |  Bin 0 -> 15606 bytes
 .../codecs/simpletext/SimpleTextBKDWriter.java     |   93 +-
 .../java/org/apache/lucene/util/bkd/BKDWriter.java |   78 +-
 .../apache/lucene/util/bkd/HeapPointReader.java    |    2 +-
 .../apache/lucene/util/bkd/HeapPointWriter.java    |   10 +-
 .../test/org/apache/lucene/util/bkd/TestBKD.java   |   12 +-
 .../lucene/index/BaseNormsFormatTestCase.java      |    2 +-
 solr/CHANGES.txt                                   |   19 +
 ...package-info.java => CollectionsCollector.java} |   23 +-
 .../{package-info.java => MetricCollector.java}    |    7 +-
 .../solr/prometheus/collector/MetricSamples.java   |   73 ++
 .../{package-info.java => MetricsCollector.java}   |   29 +-
 .../collector/MetricsCollectorFactory.java         |   72 ++
 .../{package-info.java => PingCollector.java}      |   31 +-
 .../collector/SchedulerMetricsCollector.java       |  131 +++
 .../{package-info.java => SearchCollector.java}    |   23 +-
 .../solr/prometheus/collector/SolrCollector.java   |  463 --------
 .../solr/prometheus/collector/package-info.java    |    4 +-
 ...ge-info.java => CachedPrometheusCollector.java} |   24 +-
 .../prometheus/exporter/MetricsConfiguration.java  |   94 ++
 .../solr/prometheus/exporter/MetricsQuery.java     |  137 +++
 .../exporter/PrometheusExporterSettings.java       |   96 ++
 .../prometheus/exporter/SolrClientFactory.java     |   78 ++
 .../solr/prometheus/exporter/SolrExporter.java     |  266 ++---
 .../exporter/SolrScrapeConfiguration.java          |   59 +
 .../solr/prometheus/exporter/package-info.java     |    4 +-
 .../org/apache/solr/prometheus/scraper/Async.java  |   60 +
 .../solr/prometheus/scraper/SolrCloudScraper.java  |  154 +++
 .../solr/prometheus/scraper/SolrScraper.java       |  269 ++---
 .../prometheus/scraper/SolrStandaloneScraper.java  |  107 ++
 .../solr/prometheus/scraper/package-info.java      |    4 +-
 ...heus-solr-exporter-integration-test-config.xml} |  164 +--
 ...rometheus-solr-exporter-scraper-test-config.xml |  162 +++
 .../collection1/conf/managed-schema                |    0
 .../collection1/conf/solrconfig.xml                |   22 +-
 .../collection1/conf/stopwords.txt                 |    0
 .../collection1/conf/synonyms.txt                  |    0
 .../src/test-files/solr/solr.xml                   |   42 +
 ...stBase.java => PrometheusExporterTestBase.java} |   56 +-
 .../prometheus/collector/MetricSamplesTest.java    |  100 ++
 .../prometheus/collector/SolrCollectorTest.java    |   94 --
 .../exporter/SolrExporterIntegrationTest.java      |   98 ++
 .../solr/prometheus/exporter/SolrExporterTest.java |   99 --
 .../prometheus/exporter/SolrExporterTestBase.java  |  121 +-
 .../apache/solr/prometheus/scraper/AsyncTest.java  |   78 ++
 .../prometheus/scraper/SolrCloudScraperTest.java   |  205 ++++
 .../scraper/SolrStandaloneScraperTest.java         |  152 +++
 .../org/apache/solr/prometheus/utils/Helpers.java  |   56 +
 .../client/solrj/embedded/JettySolrRunner.java     |   20 +-
 .../java/org/apache/solr/core/CoreContainer.java   |    6 +-
 .../src/java/org/apache/solr/core/SolrCore.java    |    3 +-
 .../apache/solr/handler/RequestHandlerBase.java    |    5 +-
 .../solr/handler/component/FacetComponent.java     |   12 +
 .../solr/handler/component/QueryComponent.java     |   33 +-
 .../solr/handler/component/ResponseBuilder.java    |    7 +-
 .../solr/handler/component/SearchHandler.java      |   21 +-
 .../java/org/apache/solr/request/SimpleFacets.java |    7 +-
 .../apache/solr/response/BasicResultContext.java   |    1 +
 .../org/apache/solr/search/SolrIndexSearcher.java  |    2 +-
 .../org/apache/solr/search/facet/FacetModule.java  |   14 +-
 .../org/apache/solr/search/facet/FacetRequest.java |    9 +-
 .../SearchGroupShardResponseProcessor.java         |    4 +-
 .../TopGroupsShardResponseProcessor.java           |    4 +-
 .../apache/solr/update/DefaultSolrCoreState.java   |    2 +-
 .../processor/DistributedUpdateProcessor.java      |    4 +-
 .../configsets/exitable-directory/conf/schema.xml  |    1 +
 .../exitable-directory/conf/solrconfig.xml         |   79 +-
 .../cloud/CloudExitableDirectoryReaderTest.java    |  185 ++-
 .../test/org/apache/solr/cloud/OverseerTest.java   |    9 +-
 .../solr/cloud/TrollingIndexReaderFactory.java     |  229 ++++
 .../cloud/autoscaling/TriggerIntegrationTest.java  |  118 +-
 .../autoscaling/sim/TestSimTriggerIntegration.java |  238 ++--
 .../org/apache/solr/handler/TestSQLHandler.java    |  289 ++---
 solr/solr-ref-guide/src/collections-api.adoc       |   28 +
 solr/solr-ref-guide/src/docvalues.adoc             |    4 +-
 .../src/indexing-and-basic-data-operations.adoc    |    4 +-
 .../src/major-changes-in-solr-7.adoc               |    8 +-
 solr/solr-ref-guide/src/managed-resources.adoc     |    2 +-
 ...onitoring-solr-with-prometheus-and-grafana.adoc |    3 +
 solr/solr-ref-guide/src/reindexing.adoc            |  191 ++++
 solr/solr-ref-guide/src/schema-api.adoc            |   12 +-
 .../src/shards-and-indexing-data-in-solrcloud.adoc |    2 +-
 solr/solr-ref-guide/src/solr-tutorial.adoc         |    6 +-
 solr/solr-ref-guide/src/solr-upgrade-notes.adoc    |   20 +
 .../src/updating-parts-of-documents.adoc           |    4 +-
 ...oudSolrClient.java => BaseCloudSolrClient.java} |  640 +++--------
 ...ider.java => BaseHttpClusterStateProvider.java} |   83 +-
 .../solr/client/solrj/impl/BaseHttpSolrClient.java |   80 ++
 .../client/solrj/impl/CloudHttp2SolrClient.java    |  237 ++++
 .../solr/client/solrj/impl/CloudSolrClient.java    | 1186 +-------------------
 .../solrj/impl/Http2ClusterStateProvider.java      |   46 +
 .../solr/client/solrj/impl/Http2SolrClient.java    |   83 +-
 .../solrj/impl/HttpClusterStateProvider.java       |  301 +----
 .../solr/client/solrj/impl/HttpSolrClient.java     |   52 +-
 .../java/org/apache/solr/client/solrj/io/Lang.java |    1 +
 .../io/eval/EmpiricalDistributionEvaluator.java    |   24 +-
 .../client/solrj/io/stream/HashRollupStream.java   |  256 +++++
 .../solr/client/solrj/io/stream/TupStream.java     |   45 +-
 .../solr/client/solrj/io/stream/ZplotStream.java   |  106 +-
 .../client/solrj/io/stream/metrics/MaxMetric.java  |   16 +-
 .../client/solrj/io/stream/metrics/MeanMetric.java |   10 +-
 .../client/solrj/io/stream/metrics/MinMetric.java  |   16 +-
 .../client/solrj/io/stream/metrics/SumMetric.java  |    8 +-
 .../solr/client/solrj/request/UpdateRequest.java   |   76 +-
 .../apache/solr/common/cloud/DocCollection.java    |    8 +-
 .../org/apache/solr/common/util/JavaBinCodec.java  |    4 +-
 .../impl/CloudHttp2SolrClientBadInputTest.java     |   73 ++
 .../impl/CloudHttp2SolrClientBuilderTest.java      |   84 ++
 .../CloudHttp2SolrClientMultiConstructorTest.java  |   85 ++
 .../solrj/impl/CloudHttp2SolrClientRetryTest.java  |   83 ++
 .../solrj/impl/CloudHttp2SolrClientTest.java       |  978 ++++++++++++++++
 .../solrj/impl/CloudSolrClientCacheTest.java       |    2 +-
 .../org/apache/solr/client/solrj/io/TestLang.java  |    2 +-
 .../client/solrj/io/stream/JDBCStreamTest.java     |   22 +-
 .../client/solrj/io/stream/MathExpressionTest.java |  139 ++-
 .../solrj/io/stream/StreamDecoratorTest.java       |  274 +++++
 .../apache/solr/common/util/TestJavaBinCodec.java  |   22 +
 .../src/java/org/apache/solr/SolrTestCaseJ4.java   |   56 +
 .../apache/solr/cloud/MiniSolrCloudCluster.java    |   61 +-
 .../org/apache/solr/cloud/SolrCloudTestCase.java   |    8 +-
 125 files changed, 6661 insertions(+), 3986 deletions(-)