You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/09/02 15:44:42 UTC

[49/50] lucene-solr:feature/autoscaling_72: Merge branch 'master' into feature/autoscaling

Merge branch 'master' into feature/autoscaling

# Conflicts:
#	solr/CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b2cf38c1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b2cf38c1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b2cf38c1

Branch: refs/heads/feature/autoscaling_72
Commit: b2cf38c19144b99c0cab3c55cccb1f01199bee43
Parents: ce7db65 c2c2e8a
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Sat Sep 2 21:12:07 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Sat Sep 2 21:12:07 2017 +0530

----------------------------------------------------------------------
 dev-tools/scripts/buildAndPushRelease.py        |   2 +-
 lucene/CHANGES.txt                              |  77 ++-
 .../SimpleNaiveBayesDocumentClassifier.java     |  30 +-
 lucene/common-build.xml                         |  33 +-
 .../tokenattributes/CharTermAttributeImpl.java  |   3 +
 .../org/apache/lucene/search/BooleanQuery.java  |  64 +++
 .../lucene/search/MinShouldMatchSumScorer.java  |  51 +-
 .../src/java/org/apache/lucene/util/BitSet.java |   4 +-
 .../org/apache/lucene/util/FixedBitSet.java     |   4 +-
 .../java/org/apache/lucene/util/LongBitSet.java |   8 +-
 .../apache/lucene/util/SparseFixedBitSet.java   |   4 +-
 .../TestCharTermAttributeImpl.java              |  10 +
 .../lucene/search/TestBooleanRewrites.java      |  53 ++
 .../lucene/search/TestConstantScoreQuery.java   |   7 +-
 .../org/apache/lucene/util/TestLongBitSet.java  |  24 +-
 .../org/apache/lucene/facet/FacetField.java     |   4 +-
 .../lucene/facet/LongValueFacetCounts.java      | 492 +++++++++++++++++
 .../facet/range/LongRangeFacetCounts.java       |  10 +-
 .../lucene/facet/range/RangeFacetCounts.java    |   2 +-
 .../taxonomy/writercache/CharBlockArray.java    |   3 +
 .../lucene/facet/TestLongValueFacetCounts.java  | 543 +++++++++++++++++++
 .../facet/range/TestRangeFacetCounts.java       |  41 +-
 .../writercache/Test2GBCharBlockArray.java      |  46 ++
 .../writercache/TestCharBlockArray.java         |   4 +-
 lucene/ivy-versions.properties                  |   8 +-
 lucene/licenses/httpclient-4.4.1.jar.sha1       |   1 -
 lucene/licenses/httpclient-4.5.3.jar.sha1       |   1 +
 lucene/licenses/httpcore-4.4.1.jar.sha1         |   1 -
 lucene/licenses/httpcore-4.4.6.jar.sha1         |   1 +
 .../randomizedtesting-runner-2.5.2.jar.sha1     |   1 -
 .../randomizedtesting-runner-2.5.3.jar.sha1     |   1 +
 .../lucene/replicator/nrt/PrimaryNode.java      |  12 -
 .../lucene/replicator/nrt/ReplicaNode.java      |  10 -
 .../org/apache/lucene/search/CoveringQuery.java | 180 ++++++
 .../apache/lucene/search/CoveringScorer.java    | 225 ++++++++
 .../apache/lucene/search/TestCoveringQuery.java | 157 ++++++
 .../lucene/spatial3d/geom/BasePlanetObject.java |  10 +
 .../lucene/spatial3d/geom/DistanceStyle.java    |  34 ++
 .../lucene/spatial3d/geom/GeoAreaShape.java     |   7 +-
 .../geom/GeoBaseCompositeAreaShape.java         |  13 +
 .../geom/GeoBaseCompositeMembershipShape.java   |  13 +
 .../spatial3d/geom/GeoBaseCompositeShape.java   |  22 +
 .../spatial3d/geom/GeoComplexPolygon.java       |  57 +-
 .../spatial3d/geom/GeoCompositeAreaShape.java   |  12 +
 .../geom/GeoCompositeMembershipShape.java       |  12 +
 .../spatial3d/geom/GeoCompositePolygon.java     |  12 +
 .../spatial3d/geom/GeoConcavePolygon.java       |  48 +-
 .../lucene/spatial3d/geom/GeoConvexPolygon.java |  48 +-
 .../geom/GeoDegenerateHorizontalLine.java       |  20 +
 .../geom/GeoDegenerateLatitudeZone.java         |  18 +
 .../geom/GeoDegenerateLongitudeSlice.java       |  18 +
 .../spatial3d/geom/GeoDegeneratePoint.java      |  22 +-
 .../geom/GeoDegenerateVerticalLine.java         |  20 +
 .../lucene/spatial3d/geom/GeoLatitudeZone.java  |  19 +
 .../spatial3d/geom/GeoLongitudeSlice.java       |  19 +
 .../spatial3d/geom/GeoNorthLatitudeZone.java    |  18 +
 .../spatial3d/geom/GeoNorthRectangle.java       |  20 +
 .../apache/lucene/spatial3d/geom/GeoPoint.java  |  24 +-
 .../lucene/spatial3d/geom/GeoPointShape.java    |  25 +
 .../spatial3d/geom/GeoPointShapeFactory.java    |  38 ++
 .../lucene/spatial3d/geom/GeoRectangle.java     |  21 +
 .../apache/lucene/spatial3d/geom/GeoShape.java  |   3 +-
 .../spatial3d/geom/GeoSouthLatitudeZone.java    |  18 +
 .../spatial3d/geom/GeoSouthRectangle.java       |  20 +
 .../spatial3d/geom/GeoStandardCircle.java       |  23 +
 .../lucene/spatial3d/geom/GeoStandardPath.java  |  46 +-
 .../geom/GeoWideDegenerateHorizontalLine.java   |  20 +
 .../spatial3d/geom/GeoWideLongitudeSlice.java   |  19 +
 .../spatial3d/geom/GeoWideNorthRectangle.java   |  24 +
 .../lucene/spatial3d/geom/GeoWideRectangle.java |  26 +
 .../spatial3d/geom/GeoWideSouthRectangle.java   |  24 +
 .../apache/lucene/spatial3d/geom/GeoWorld.java  |  17 +
 .../spatial3d/geom/LinearSquaredDistance.java   |  10 +
 .../spatial3d/geom/NormalSquaredDistance.java   |  10 +
 .../org/apache/lucene/spatial3d/geom/Plane.java | 180 +++++-
 .../lucene/spatial3d/geom/PlanetModel.java      |  19 +-
 .../lucene/spatial3d/geom/PlanetObject.java     |   3 +-
 .../spatial3d/geom/SerializableObject.java      | 470 ++++++++++++++++
 .../lucene/spatial3d/geom/StandardObjects.java  |  81 +++
 .../lucene/spatial3d/geom/StandardXYZSolid.java |  49 ++
 .../apache/lucene/spatial3d/geom/XYdZSolid.java |  44 ++
 .../apache/lucene/spatial3d/geom/XdYZSolid.java |  44 ++
 .../lucene/spatial3d/geom/XdYdZSolid.java       |  39 ++
 .../apache/lucene/spatial3d/geom/dXYZSolid.java |  44 ++
 .../lucene/spatial3d/geom/dXYdZSolid.java       |  39 ++
 .../lucene/spatial3d/geom/dXdYZSolid.java       |  39 ++
 .../lucene/spatial3d/geom/dXdYdZSolid.java      |  35 ++
 .../spatial3d/geom/RandomBinaryCodecTest.java   |  69 +++
 .../geom/SimpleGeoPolygonRelationshipsTest.java |  14 +
 .../analyzing/AnalyzingInfixSuggester.java      |  14 +-
 solr/CHANGES.txt                                | 312 +++++------
 solr/bin/solr                                   |  87 ++-
 solr/bin/solr.cmd                               | 125 +++--
 solr/bin/solr.in.cmd                            |   4 +-
 solr/bin/solr.in.sh                             |  10 +-
 .../LTRFeatureLoggerTransformerFactory.java     |  19 +-
 .../org/apache/solr/ltr/TestLTROnSolrCloud.java |  31 +-
 .../solr/ltr/feature/TestExternalFeatures.java  |   8 +-
 .../solrj/embedded/EmbeddedSolrServer.java      |   1 +
 .../apache/solr/cloud/ReplicateFromLeader.java  |   1 -
 .../org/apache/solr/cloud/ZkController.java     |   2 +-
 .../src/java/org/apache/solr/core/SolrCore.java |   2 +-
 .../java/org/apache/solr/core/SolrInfoBean.java |   1 +
 .../apache/solr/handler/AnalyzeEvaluator.java   |   5 +-
 .../solr/handler/CdcrReplicatorManager.java     |   6 +
 .../apache/solr/handler/CdcrRequestHandler.java |   2 +-
 .../apache/solr/handler/RequestHandlerBase.java |   4 +-
 .../org/apache/solr/handler/StreamHandler.java  | 139 ++++-
 .../handler/component/RealTimeGetComponent.java |   4 +-
 .../solr/handler/component/SearchComponent.java |   4 +-
 .../solr/handler/component/TermsComponent.java  |   8 +-
 .../org/apache/solr/handler/sql/SolrTable.java  |  12 +-
 .../solr/highlight/HighlightingPluginBase.java  |   4 +-
 .../metrics/reporters/SolrSlf4jReporter.java    |   9 +-
 .../solr/request/json/JsonQueryConverter.java   | 110 ++++
 .../apache/solr/request/json/RequestUtil.java   |  10 +-
 .../org/apache/solr/response/DocsStreamer.java  |   6 +-
 .../transform/BaseEditorialTransformer.java     |   2 +-
 .../transform/ChildDocTransformerFactory.java   |   2 +-
 .../transform/DocIdAugmenterFactory.java        |   2 +-
 .../solr/response/transform/DocTransformer.java |  18 +-
 .../response/transform/DocTransformers.java     |   7 +
 .../transform/ExplainAugmenterFactory.java      |   2 +-
 .../transform/GeoTransformerFactory.java        |   4 +-
 .../transform/RawValueTransformerFactory.java   |   2 +-
 .../transform/RenameFieldTransformer.java       |   2 +-
 .../solr/response/transform/ScoreAugmenter.java |   5 +
 .../transform/SubQueryAugmenterFactory.java     |   2 +-
 .../transform/ValueAugmenterFactory.java        |   2 +-
 .../transform/ValueSourceAugmenter.java         |   2 +-
 .../apache/solr/search/BoolQParserPlugin.java   |  58 ++
 .../org/apache/solr/search/QParserPlugin.java   |   1 +
 .../apache/solr/search/SolrFieldCacheBean.java  |   4 +-
 .../apache/solr/search/SolrIndexSearcher.java   |   4 +-
 .../solr/search/facet/UnInvertedField.java      |  24 +-
 .../apache/solr/servlet/SolrDispatchFilter.java |   6 +-
 .../solr/servlet/StartupLoggingUtils.java       | 116 ----
 .../apache/solr/store/blockcache/Metrics.java   |   5 +-
 .../solr/store/hdfs/HdfsLocalityReporter.java   |   3 +-
 .../apache/solr/uninverting/DocTermOrds.java    | 117 ++--
 .../org/apache/solr/update/UpdateHandler.java   |   4 +-
 .../java/org/apache/solr/update/UpdateLog.java  |  13 +-
 .../apache/solr/update/UpdateShardHandler.java  |   4 +-
 .../src/java/org/apache/solr/util/SolrCLI.java  | 213 +++++---
 .../apache/solr/util/StartupLoggingUtils.java   | 129 +++++
 .../TestEmbeddedSolrServerAdminHandler.java     |  78 +++
 .../apache/solr/cloud/HttpPartitionTest.java    |   2 +
 .../org/apache/solr/cloud/ZkFailoverTest.java   |  90 +++
 .../test/org/apache/solr/core/MockInfoBean.java |   4 +-
 .../apache/solr/core/TestJmxIntegration.java    |   8 +-
 .../apache/solr/handler/TestReqParamsAPI.java   |   3 +-
 .../solr/handler/admin/MBeansHandlerTest.java   |  76 +++
 .../DistributedTermsComponentTest.java          |  12 +-
 .../handler/component/TermsComponentTest.java   |  24 +-
 .../reporters/SolrSlf4jReporterTest.java        |  41 +-
 .../solr/response/TestCustomDocTransformer.java |   2 +-
 .../apache/solr/search/QueryEqualityTest.java   |  21 +
 .../apache/solr/search/TestSmileRequest.java    |   2 +-
 .../solr/search/json/TestJsonRequest.java       | 179 +++++-
 .../solr/uninverting/TestDocTermOrds.java       |  53 ++
 solr/licenses/httpclient-4.4.1.jar.sha1         |   1 -
 solr/licenses/httpclient-4.5.3.jar.sha1         |   1 +
 solr/licenses/httpcore-4.4.1.jar.sha1           |   1 -
 solr/licenses/httpcore-4.4.6.jar.sha1           |   1 +
 solr/licenses/httpmime-4.4.1.jar.sha1           |   1 -
 solr/licenses/httpmime-4.5.3.jar.sha1           |   1 +
 solr/licenses/junit4-ant-2.5.2.jar.sha1         |   1 -
 solr/licenses/junit4-ant-2.5.3.jar.sha1         |   1 +
 .../randomizedtesting-runner-2.5.2.jar.sha1     |   1 -
 .../randomizedtesting-runner-2.5.3.jar.sha1     |   1 +
 .../src/cross-data-center-replication-cdcr.adoc |   1 -
 solr/solr-ref-guide/src/docvalues.adoc          |  24 +-
 .../field-type-definitions-and-properties.adoc  |   2 +-
 .../src/field-types-included-with-solr.adoc     |  81 ++-
 solr/solr-ref-guide/src/function-queries.adoc   |   2 +-
 .../solr-ref-guide/src/how-solrcloud-works.adoc |   3 +-
 solr/solr-ref-guide/src/how-to-contribute.adoc  |   3 +-
 solr/solr-ref-guide/src/index.adoc              |   2 +-
 .../src/indexconfig-in-solrconfig.adoc          |   2 +-
 .../src/major-changes-in-solr-7.adoc            | 187 +++++++
 solr/solr-ref-guide/src/other-parsers.adoc      |   2 +-
 .../src/putting-the-pieces-together.adoc        |   4 +-
 .../read-and-write-side-fault-tolerance.adoc    | 109 ----
 solr/solr-ref-guide/src/schema-api.adoc         |   3 +-
 .../shards-and-indexing-data-in-solrcloud.adoc  |   4 +-
 solr/solr-ref-guide/src/solr-upgrade-notes.adoc |  56 +-
 ...olrcloud-autoscaling-policy-preferences.adoc |   4 +-
 ...rcloud-query-routing-and-read-tolerance.adoc |  85 +++
 ...olrcloud-recoveries-and-write-tolerance.adoc |  43 ++
 .../src/solrcloud-resilience.adoc               |  28 +
 solr/solr-ref-guide/src/solrcloud.adoc          |   6 +-
 .../src/the-extended-dismax-query-parser.adoc   |  21 +-
 .../src/the-query-elevation-component.adoc      |  12 +-
 .../src/the-standard-query-parser.adoc          |   6 +-
 .../src/update-request-processors.adoc          |   2 +-
 .../src/updatehandlers-in-solrconfig.adoc       |   2 +-
 solr/solr-ref-guide/src/working-with-dates.adoc |   2 +-
 ...rking-with-external-files-and-processes.adoc |   6 +-
 .../solrj/io/eval/AbsoluteValueEvaluator.java   |  32 +-
 .../client/solrj/io/eval/AddAllEvaluator.java   |  69 ---
 .../solr/client/solrj/io/eval/AddEvaluator.java |  48 +-
 .../solr/client/solrj/io/eval/AndEvaluator.java |  47 +-
 .../client/solrj/io/eval/AnovaEvaluator.java    |  69 +--
 .../client/solrj/io/eval/AppendEvaluator.java   |  53 ++
 .../solrj/io/eval/ArcCosineEvaluator.java       |  33 +-
 .../client/solrj/io/eval/ArcSineEvaluator.java  |  33 +-
 .../solrj/io/eval/ArcTangentEvaluator.java      |  33 +-
 .../client/solrj/io/eval/ArrayEvaluator.java    |  85 +--
 .../solr/client/solrj/io/eval/AscEvaluator.java |  75 ++-
 .../client/solrj/io/eval/BooleanEvaluator.java  |  83 ---
 .../client/solrj/io/eval/CeilingEvaluator.java  |  36 +-
 .../client/solrj/io/eval/CoalesceEvaluator.java |  21 +-
 .../client/solrj/io/eval/ColumnEvaluator.java   |  83 +--
 .../client/solrj/io/eval/ComplexEvaluator.java  | 126 -----
 .../solrj/io/eval/ConditionalEvaluator.java     |  56 --
 .../solrj/io/eval/ConversionEvaluator.java      | 144 +++--
 .../solrj/io/eval/ConvolutionEvaluator.java     |  77 +--
 .../client/solrj/io/eval/CopyOfEvaluator.java   |  85 ++-
 .../solrj/io/eval/CopyOfRangeEvaluator.java     | 104 ++--
 .../solrj/io/eval/CorrelationEvaluator.java     |  70 +--
 .../client/solrj/io/eval/CosineEvaluator.java   |  33 +-
 .../solrj/io/eval/CovarianceEvaluator.java      |  70 +--
 .../solrj/io/eval/CubedRootEvaluator.java       |  33 +-
 .../io/eval/CumulativeProbabilityEvaluator.java |  61 +--
 .../client/solrj/io/eval/DescribeEvaluator.java |  63 +--
 .../client/solrj/io/eval/DistanceEvaluator.java |  82 ---
 .../client/solrj/io/eval/DivideEvaluator.java   |  44 +-
 .../io/eval/EmpiricalDistributionEvaluator.java |  56 +-
 .../client/solrj/io/eval/EqualToEvaluator.java  |  73 +++
 .../client/solrj/io/eval/EqualsEvaluator.java   | 109 ----
 .../io/eval/EuclideanDistanceEvaluator.java     |  56 ++
 .../solrj/io/eval/EvaluatorException.java       |   4 +-
 .../solrj/io/eval/ExclusiveOrEvaluator.java     |  42 +-
 .../client/solrj/io/eval/FieldEvaluator.java    | 100 ----
 .../solrj/io/eval/FieldValueEvaluator.java      | 100 ++++
 .../solrj/io/eval/FindDelayEvaluator.java       |  98 ++--
 .../client/solrj/io/eval/FloorEvaluator.java    |  36 +-
 .../io/eval/GreaterThanEqualToEvaluator.java    |  45 +-
 .../solrj/io/eval/GreaterThanEvaluator.java     |  45 +-
 .../solrj/io/eval/HistogramEvaluator.java       | 108 ++--
 .../io/eval/HyperbolicCosineEvaluator.java      |  33 +-
 .../solrj/io/eval/HyperbolicSineEvaluator.java  |  33 +-
 .../io/eval/HyperbolicTangentEvaluator.java     |  33 +-
 .../solrj/io/eval/IfThenElseEvaluator.java      |  31 +-
 .../io/eval/KolmogorovSmirnovEvaluator.java     |  93 ++--
 .../client/solrj/io/eval/LengthEvaluator.java   |  56 +-
 .../solrj/io/eval/LessThanEqualToEvaluator.java |  45 +-
 .../client/solrj/io/eval/LessThanEvaluator.java |  45 +-
 .../client/solrj/io/eval/ManyValueWorker.java   |  25 +
 .../client/solrj/io/eval/ModuloEvaluator.java   |  42 +-
 .../solrj/io/eval/MovingAverageEvaluator.java   |  82 ++-
 .../client/solrj/io/eval/MultiplyEvaluator.java |  49 +-
 .../solrj/io/eval/NaturalLogEvaluator.java      |  35 +-
 .../io/eval/NormalDistributionEvaluator.java    |  45 +-
 .../solrj/io/eval/NormalizeEvaluator.java       |  65 +--
 .../solr/client/solrj/io/eval/NotEvaluator.java |  45 +-
 .../client/solrj/io/eval/NumberEvaluator.java   |  89 ---
 .../client/solrj/io/eval/OneValueWorker.java    |  34 ++
 .../solr/client/solrj/io/eval/OrEvaluator.java  |  47 +-
 .../solrj/io/eval/PercentileEvaluator.java      |  69 +--
 .../client/solrj/io/eval/PowerEvaluator.java    |  29 +-
 .../client/solrj/io/eval/PredictEvaluator.java  |  79 +--
 .../client/solrj/io/eval/RankEvaluator.java     |  66 +--
 .../client/solrj/io/eval/RawValueEvaluator.java |   2 +-
 .../io/eval/RecursiveBooleanEvaluator.java      | 112 ++++
 .../solrj/io/eval/RecursiveEvaluator.java       | 240 ++++++++
 .../io/eval/RecursiveNumericEvaluator.java      |  75 +++
 .../io/eval/RecursiveNumericListEvaluator.java  |  67 +++
 .../solrj/io/eval/RecursiveObjectEvaluator.java |  35 ++
 .../io/eval/RecursiveTemporalEvaluator.java     | 114 ++++
 .../solrj/io/eval/RegressionEvaluator.java      |  87 ++-
 .../solrj/io/eval/ResidualsEvaluator.java       |  99 ++--
 .../client/solrj/io/eval/ReverseEvaluator.java  |  63 +--
 .../client/solrj/io/eval/RoundEvaluator.java    |  33 +-
 .../client/solrj/io/eval/SampleEvaluator.java   |  59 +-
 .../client/solrj/io/eval/ScaleEvaluator.java    |  79 +--
 .../client/solrj/io/eval/SequenceEvaluator.java |  67 +--
 .../client/solrj/io/eval/SimpleEvaluator.java   |  36 --
 .../client/solrj/io/eval/SineEvaluator.java     |  33 +-
 .../client/solrj/io/eval/SourceEvaluator.java   |  36 ++
 .../solrj/io/eval/SquareRootEvaluator.java      |  33 +-
 .../client/solrj/io/eval/StreamEvaluator.java   |   2 +-
 .../solrj/io/eval/StreamEvaluatorException.java |  32 ++
 .../client/solrj/io/eval/SubtractEvaluator.java |  65 ++-
 .../client/solrj/io/eval/TangentEvaluator.java  |  33 +-
 .../client/solrj/io/eval/TemporalEvaluator.java | 136 -----
 .../solrj/io/eval/TemporalEvaluatorDay.java     |  16 +-
 .../io/eval/TemporalEvaluatorDayOfQuarter.java  |  18 +-
 .../io/eval/TemporalEvaluatorDayOfYear.java     |  18 +-
 .../solrj/io/eval/TemporalEvaluatorEpoch.java   |  22 +-
 .../solrj/io/eval/TemporalEvaluatorHour.java    |  18 +-
 .../solrj/io/eval/TemporalEvaluatorMinute.java  |  18 +-
 .../solrj/io/eval/TemporalEvaluatorMonth.java   |  18 +-
 .../solrj/io/eval/TemporalEvaluatorQuarter.java |  18 +-
 .../solrj/io/eval/TemporalEvaluatorSecond.java  |  18 +-
 .../solrj/io/eval/TemporalEvaluatorWeek.java    |  18 +-
 .../solrj/io/eval/TemporalEvaluatorYear.java    |  18 +-
 .../client/solrj/io/eval/TwoValueWorker.java    |  34 ++
 .../io/eval/UniformDistributionEvaluator.java   |  45 +-
 .../client/solrj/io/eval/UuidEvaluator.java     |  16 +-
 .../solr/client/solrj/io/eval/ValueWorker.java  |  25 +
 .../solrj/io/stream/CartesianProductStream.java |   4 +-
 .../client/solrj/io/stream/HavingStream.java    |  20 +-
 .../solrj/io/stream/expr/StreamFactory.java     |   8 +-
 .../solrj/io/stream/StreamExpressionTest.java   |  43 +-
 .../solrj/io/stream/eval/AddEvaluatorTest.java  |  20 +-
 .../io/stream/eval/AppendEvaluatorTest.java     |  62 +++
 .../solrj/io/stream/eval/AscEvaluatorTest.java  | 107 ++++
 .../io/stream/eval/CoalesceEvaluatorTest.java   |   4 +-
 .../io/stream/eval/CompoundEvaluatorTest.java   |  85 ---
 .../stream/eval/ConversionEvaluatorsTest.java   |   2 +-
 .../stream/eval/CorrelationEvaluatorTest.java   |  55 ++
 .../CumulativeProbabilityEvaluatorTest.java     |  56 ++
 .../EmpiricalDistributionEvaluatorTest.java     |  57 ++
 .../io/stream/eval/EqualToEvaluatorTest.java    | 263 +++++++++
 .../io/stream/eval/EqualsEvaluatorTest.java     | 263 ---------
 .../io/stream/eval/FieldEvaluatorTest.java      | 114 ----
 .../io/stream/eval/FieldValueEvaluatorTest.java | 114 ++++
 .../eval/HyperbolicTangentEvaluatorTest.java    |   4 +-
 .../io/stream/eval/MultiplyEvaluatorTest.java   |  18 +-
 .../eval/NormalDistributionEvaluatorTest.java   |  54 ++
 .../io/stream/eval/NormalizeEvaluatorTest.java  |  74 +++
 .../io/stream/eval/RecursiveEvaluatorTest.java  |  85 +++
 .../io/stream/eval/RegressionEvaluatorTest.java |  63 +++
 .../io/stream/eval/ReverseEvaluatorTest.java    |  57 ++
 .../io/stream/eval/TemporalEvaluatorsTest.java  |  48 +-
 .../eval/UniformDistributionEvaluatorTest.java  |  55 ++
 .../java/org/apache/solr/SolrTestCaseJ4.java    |   6 +-
 328 files changed, 9917 insertions(+), 4688 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b2cf38c1/solr/CHANGES.txt
----------------------------------------------------------------------
diff --cc solr/CHANGES.txt
index a8003be,493d52f..4eeb0c7
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@@ -66,6 -57,13 +66,13 @@@ Upgrade Note
    If a reporter configures the group="cluster" attribute then please also configure the
    class="org.apache.solr.metrics.reporters.solr.SolrClusterReporter" attribute.
  
+ * SOLR-11254: the abstract DocTransformer class now has an abstract score-less transform method variant.
+ 
+ * SOLR-11283: all Stream Evaluators in solrj.io.eval have been refactored to have a simplier and more
 -  robust structure. This simplifies and condenses the code required to implement a new Evaluator and 
++  robust structure. This simplifies and condenses the code required to implement a new Evaluator and
+   makes it much easier for evaluators to handle differing data types (primitives, objects, arrays,
+   lists, and so forth). (Dennis Gove)
+ 
  New Features
  ----------------------
  
@@@ -178,12 -169,18 +198,22 @@@ Other Change
  
  * SOLR-11195: Require class attribute for shard and cluster metric reporter configuration. (Christine Poerschke)
  
 +* SOLR:10822: Share a Policy.session object between multiple collection admin calls to get the correct computations (noble)
 +
  * SOLR-11249: Upgrade Jetty from 9.3.14.v20161028 to 9.3.20.v20170531 (Michael Braun via David Smiley)
  
 +* SOLR-11270: Automatically added SystemLogListener should not prevent deleting a trigger. (ab)
 +
+ * SOLR-5129: Timeout property for waiting ZK get started. (Cao Manh Dat, Hrishikesh Gadre, Varun Thacker)
+ 
 -* SOLR-10628: Less verbose output from bin/solr commands. (Jason Gerlowski, janhoy) 
++* SOLR-10628: Less verbose output from bin/solr commands. (Jason Gerlowski, janhoy)
+ 
+ * SOLR-11240: Raise UnInvertedField internal limit. (Toke Eskildsen)
+ 
+ * SOLR-11254: Add score-less (abstract) DocTransformer.transform method. (Christine Poerschke)
+ 
+ * SOLR-11209: Upgrade HttpClient to 4.5.3. (Hrishikesh Gadre via Mark Miller)
+ 
  ==================  7.0.0 ==================
  
  Versions of Major Components

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b2cf38c1/solr/core/src/java/org/apache/solr/cloud/ZkController.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b2cf38c1/solr/core/src/java/org/apache/solr/core/SolrCore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b2cf38c1/solr/core/src/java/org/apache/solr/util/SolrCLI.java
----------------------------------------------------------------------