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 2020/05/11 09:52:24 UTC

[lucene-solr] branch jira/solr-14423 updated (b1ca0a5 -> 096add4)

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

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


    from b1ca0a5  SOLR-14423: Add a unit test for FilterCalciteConnection. Fix some issues from review.
     add d4dbd0b  SOLR-14173: Add entry in CHANGES.txt
     add c6d4aea  LUCENE-9350: Don't hold references to large automata on FuzzyQuery (#1467)
     add e286638  LUCENE-9350: Add changes entry
     add 5834992  LUCENE-7822: CodecUtil#checkFooter should throw a CorruptIndexException as the main exception. (#1482)
     add d06294e  LUCENE-9366: Remove unused maxDoc parameter from DocValues.emptySortedNumeric() (#1491)
     add 28e4754  Bugfix for FuzzyQuery false negative (#1493)
     add 31b350e  SOLR-14426 Move auxiliary classes to nested classes (#1487)
     add 4c408a5  LUCENE-9362: Fix rewriting check in ExpressionValueSource (#1485)
     add 726894f  Revert "Bugfix for FuzzyQuery false negative (#1493)" (#1495)
     add 03a6023  SOLR-14465: Solr query handling code catches FuzzyTermsException
     add 30ba8de  LUCENE-9363: Only assert for no merging segments we merges are disabled
     add caa2042  Ensure nightly doesn't cause timeouts
     add 4a76a59  SOLR-14466: Upgrade log4j2 to latest release (2.13.2)
     add d9f9d6d  SOLR-13289: Add Support for BlockMax WAND (#1456)
     add 15be0db  SOLR-11934: Visit Solr logging, it's too noisy.
     add aeb9f6c  SOLR-7880: Update commons-cli to 1.4
     new 096add4  Merge branch 'master' into jira/solr-14423

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:
 lucene/CHANGES.txt                                 |   14 +
 .../java/org/apache/lucene/codecs/CodecUtil.java   |   21 +-
 .../apache/lucene/codecs/DocValuesConsumer.java    |    2 +-
 .../java/org/apache/lucene/index/DocValues.java    |    4 +-
 .../java/org/apache/lucene/index/IndexWriter.java  |    3 +-
 .../org/apache/lucene/index/MultiDocValues.java    |    2 +-
 .../lucene/search/FuzzyAutomatonBuilder.java       |   88 +
 .../java/org/apache/lucene/search/FuzzyQuery.java  |   58 +-
 .../org/apache/lucene/search/FuzzyTermsEnum.java   |  151 +-
 .../org/apache/lucene/search/MultiTermQuery.java   |    6 +-
 .../org/apache/lucene/codecs/TestCodecUtil.java    |   12 +-
 .../apache/lucene/index/TestIndexWriterReader.java |   15 +-
 .../org/apache/lucene/search/TestFuzzyQuery.java   |   84 +-
 .../org/apache/lucene/util/TestOfflineSorter.java  |   17 +-
 .../lucene/expressions/ExpressionValueSource.java  |    2 +-
 .../expressions/TestExpressionValueSource.java     |   58 +
 lucene/ivy-versions.properties                     |    4 +-
 lucene/licenses/log4j-api-2.11.2.jar.sha1          |    1 -
 lucene/licenses/log4j-api-2.13.2.jar.sha1          |    1 +
 lucene/licenses/log4j-core-2.11.2.jar.sha1         |    1 -
 lucene/licenses/log4j-core-2.13.2.jar.sha1         |    1 +
 solr/CHANGES.txt                                   |   14 +
 .../apache/solr/analytics/ExpressionFactory.java   |   78 +-
 .../apache/solr/analytics/facet/PivotFacet.java    |   77 +-
 .../function/mapping/ComparisonFunction.java       |  320 +-
 .../function/mapping/DateMathFunction.java         |  171 +-
 .../function/mapping/DateParseFunction.java        |  261 +-
 .../mapping/DecimalNumericConversionFunction.java  |  281 +-
 .../analytics/function/mapping/EqualFunction.java  |  301 +-
 .../analytics/function/mapping/ExistsFunction.java |  143 +-
 .../function/mapping/FillMissingFunction.java      | 1283 ++++---
 .../analytics/function/mapping/FilterFunction.java | 1075 +++---
 .../analytics/function/mapping/IfFunction.java     | 1268 +++---
 .../analytics/function/mapping/LambdaFunction.java | 4044 ++++++++++----------
 .../analytics/function/mapping/RemoveFunction.java | 1187 +++---
 .../function/mapping/ReplaceFunction.java          | 1519 ++++----
 .../analytics/function/reduction/MaxFunction.java  |  405 +-
 .../function/reduction/MedianFunction.java         |  237 +-
 .../analytics/function/reduction/MinFunction.java  |  405 +-
 .../function/reduction/OrdinalFunction.java        |  489 +--
 .../function/reduction/PercentileFunction.java     |  453 +--
 .../solr/analytics/util/FacetRangeGenerator.java   |  132 +-
 .../solr/analytics/util/MedianCalculator.java      |    6 +-
 .../solr/analytics/util/OrdinalCalculator.java     |   15 +-
 .../clustering/carrot2/CarrotClusteringEngine.java |    3 +-
 .../client/solrj/embedded/EmbeddedSolrServer.java  |    2 +
 .../org/apache/solr/core/QuerySenderListener.java  |    2 +-
 .../src/java/org/apache/solr/core/SolrCore.java    |    5 +-
 .../solr/handler/component/ExpandComponent.java    |    4 +-
 .../solr/handler/component/QueryComponent.java     |   28 +-
 .../solr/handler/component/ResponseBuilder.java    |    3 +-
 .../solr/handler/component/SearchHandler.java      |    2 +
 .../handler/component/SortedDateStatsValues.java   |    4 +-
 .../component/SortedNumericStatsValues.java        |    4 +-
 .../solr/handler/component/StatsValuesFactory.java | 1379 +++----
 .../solr/handler/tagger/TaggerRequestHandler.java  |    3 +-
 .../apache/solr/response/BinaryResponseWriter.java |    4 +-
 .../solr/response/GeoJSONResponseWriter.java       |   18 +-
 .../apache/solr/response/JSONResponseWriter.java   |    8 +
 .../java/org/apache/solr/response/JSONWriter.java  |   43 +-
 .../solr/response/PHPSerializedResponseWriter.java |   16 +-
 .../org/apache/solr/response/SchemaXmlWriter.java  |    5 +
 .../solr/response/TabularResponseWriter.java       |    7 +
 .../apache/solr/response/TextResponseWriter.java   |   16 +-
 .../java/org/apache/solr/response/XMLWriter.java   |   22 +
 .../response/transform/DocIdAugmenterFactory.java  |   31 +-
 .../transform/SubQueryAugmenterFactory.java        |    4 +-
 .../src/java/org/apache/solr/schema/BoolField.java |  145 +-
 .../org/apache/solr/schema/DatePointField.java     |   49 +-
 .../src/java/org/apache/solr/search/DocList.java   |    3 +
 .../src/java/org/apache/solr/search/DocSlice.java  |   13 +-
 .../org/apache/solr/search/FunctionQParser.java    |    6 +-
 .../src/java/org/apache/solr/search/Grouping.java  |    6 +-
 .../org/apache/solr/search/MaxScoreCollector.java  |    4 +-
 .../java/org/apache/solr/search/QueryCommand.java  |   10 +
 .../org/apache/solr/search/QueryResultKey.java     |   15 +-
 .../org/apache/solr/search/SolrIndexSearcher.java  |   29 +-
 .../org/apache/solr/search/ValueSourceParser.java  |  637 ++-
 .../apache/solr/search/facet/AggValueSource.java   |    2 +-
 .../java/org/apache/solr/search/facet/AvgAgg.java  |    8 +-
 .../org/apache/solr/search/facet/CountAgg.java     |    2 +-
 .../org/apache/solr/search/facet/CountValsAgg.java |   10 +-
 .../org/apache/solr/search/facet/DocValuesAcc.java |   22 +-
 .../solr/search/facet/FacetFieldProcessor.java     |    8 +-
 .../search/facet/FacetFieldProcessorByArray.java   |    4 +-
 .../search/facet/FacetFieldProcessorByArrayDV.java |    2 +-
 .../facet/FacetFieldProcessorByArrayUIF.java       |    2 +-
 .../FacetFieldProcessorByEnumTermsStream.java      |    2 +-
 .../search/facet/FacetFieldProcessorByHashDV.java  |    2 +-
 .../org/apache/solr/search/facet/FacetModule.java  |    8 +-
 .../apache/solr/search/facet/FacetProcessor.java   |   12 +-
 .../org/apache/solr/search/facet/FacetQuery.java   |    4 +-
 .../org/apache/solr/search/facet/FacetRange.java   |    4 +-
 .../org/apache/solr/search/facet/FacetRequest.java | 1122 +++---
 .../java/org/apache/solr/search/facet/HLLAgg.java  |    8 +-
 .../org/apache/solr/search/facet/MinMaxAgg.java    |   16 +-
 .../org/apache/solr/search/facet/MissingAgg.java   |    4 +-
 .../apache/solr/search/facet/PercentileAgg.java    |   12 +-
 .../apache/solr/search/facet/RelatednessAgg.java   |    6 +-
 .../java/org/apache/solr/search/facet/SlotAcc.java |   30 +-
 .../org/apache/solr/search/facet/StddevAgg.java    |    8 +-
 .../java/org/apache/solr/search/facet/SumAgg.java  |    8 +-
 .../org/apache/solr/search/facet/SumsqAgg.java     |    8 +-
 .../solr/search/facet/UnInvertedFieldAcc.java      |    6 +-
 .../org/apache/solr/search/facet/UniqueAgg.java    |    8 +-
 .../apache/solr/search/facet/UniqueBlockAgg.java   |    4 +-
 .../solr/search/facet/UniqueBlockFieldAgg.java     |    2 +-
 .../solr/search/facet/UniqueBlockQueryAgg.java     |    4 +-
 .../solr/search/facet/UniqueMultiDvSlotAcc.java    |    2 +-
 .../search/facet/UniqueMultivaluedSlotAcc.java     |    2 +-
 .../search/facet/UniqueSinglevaluedSlotAcc.java    |    2 +-
 .../apache/solr/search/facet/UniqueSlotAcc.java    |    2 +-
 .../org/apache/solr/search/facet/VarianceAgg.java  |    8 +-
 .../apache/solr/update/DirectUpdateHandler2.java   |   10 +-
 .../org/apache/solr/update/SolrIndexWriter.java    |    2 +-
 .../processor/LogUpdateProcessorFactory.java       |    3 +-
 .../org/apache/solr/BasicFunctionalityTest.java    |    2 +-
 .../test/org/apache/solr/TestCrossCoreJoin.java    |    4 +-
 .../org/apache/solr/TestDistributedSearch.java     |   32 +-
 .../test/org/apache/solr/TestGroupingSearch.java   |  184 +-
 solr/core/src/test/org/apache/solr/TestJoin.java   |   19 +-
 .../org/apache/solr/core/QueryResultKeyTest.java   |   16 +-
 .../org/apache/solr/handler/tagger/TaggerTest.java |    6 +-
 .../test/org/apache/solr/request/TestFaceting.java |   25 +
 .../org/apache/solr/response/JSONWriterTest.java   |    4 +-
 .../response/TestPHPSerializedResponseWriter.java  |    2 +-
 .../apache/solr/search/SolrIndexSearcherTest.java  |  200 +
 .../solr/search/TestAddFieldRealTimeGet.java       |    8 +-
 .../test/org/apache/solr/search/TestDocSet.java    |    3 +-
 .../org/apache/solr/search/TestRealTimeGet.java    |    6 +-
 .../org/apache/solr/search/facet/DebugAgg.java     |    8 +-
 .../solr/search/facet/TestJsonFacetRefinement.java |    2 +-
 .../apache/solr/search/facet/TestJsonFacets.java   |    2 +-
 .../facet/TestJsonFacetsWithNestedObjects.java     |   12 +-
 .../solr/search/join/TestScoreJoinQPNoScore.java   |   23 +-
 .../solr/search/join/TestScoreJoinQPScore.java     |   18 +-
 solr/licenses/commons-cli-1.2.jar.sha1             |    1 -
 solr/licenses/commons-cli-1.4.jar.sha1             |    1 +
 solr/licenses/log4j-1.2-api-2.11.2.jar.sha1        |    1 -
 solr/licenses/log4j-1.2-api-2.13.2.jar.sha1        |    1 +
 solr/licenses/log4j-api-2.11.2.jar.sha1            |    1 -
 solr/licenses/log4j-api-2.13.2.jar.sha1            |    1 +
 solr/licenses/log4j-core-2.11.2.jar.sha1           |    1 -
 solr/licenses/log4j-core-2.13.2.jar.sha1           |    1 +
 solr/licenses/log4j-slf4j-impl-2.11.2.jar.sha1     |    1 -
 solr/licenses/log4j-slf4j-impl-2.13.2.jar.sha1     |    1 +
 solr/licenses/log4j-web-2.11.2.jar.sha1            |    1 -
 solr/licenses/log4j-web-2.13.2.jar.sha1            |    1 +
 .../org/apache/solr/common/SolrDocumentList.java   |   10 +
 .../apache/solr/common/params/CommonParams.java    |    6 +
 .../solr/common/util/FastJavaBinDecoder.java       |    3 +
 .../org/apache/solr/common/util/JavaBinCodec.java  |    9 +-
 .../src/test-files/solrj/javabin_backcompat.bin    |  Bin 169 -> 170 bytes
 .../solr/common/params/CommonParamsTest.java       |    2 +
 .../apache/solr/common/util/TestJavaBinCodec.java  |   45 +-
 versions.lock                                      |   10 +-
 versions.props                                     |    4 +-
 157 files changed, 10060 insertions(+), 9225 deletions(-)
 create mode 100644 lucene/core/src/java/org/apache/lucene/search/FuzzyAutomatonBuilder.java
 delete mode 100644 lucene/licenses/log4j-api-2.11.2.jar.sha1
 create mode 100644 lucene/licenses/log4j-api-2.13.2.jar.sha1
 delete mode 100644 lucene/licenses/log4j-core-2.11.2.jar.sha1
 create mode 100644 lucene/licenses/log4j-core-2.13.2.jar.sha1
 create mode 100644 solr/core/src/test/org/apache/solr/search/SolrIndexSearcherTest.java
 delete mode 100644 solr/licenses/commons-cli-1.2.jar.sha1
 create mode 100644 solr/licenses/commons-cli-1.4.jar.sha1
 delete mode 100644 solr/licenses/log4j-1.2-api-2.11.2.jar.sha1
 create mode 100644 solr/licenses/log4j-1.2-api-2.13.2.jar.sha1
 delete mode 100644 solr/licenses/log4j-api-2.11.2.jar.sha1
 create mode 100644 solr/licenses/log4j-api-2.13.2.jar.sha1
 delete mode 100644 solr/licenses/log4j-core-2.11.2.jar.sha1
 create mode 100644 solr/licenses/log4j-core-2.13.2.jar.sha1
 delete mode 100644 solr/licenses/log4j-slf4j-impl-2.11.2.jar.sha1
 create mode 100644 solr/licenses/log4j-slf4j-impl-2.13.2.jar.sha1
 delete mode 100644 solr/licenses/log4j-web-2.11.2.jar.sha1
 create mode 100644 solr/licenses/log4j-web-2.13.2.jar.sha1


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

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-14423
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 096add480648058e15dd9e9fbddf106c1ad25d3b
Merge: b1ca0a5 aeb9f6c
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Mon May 11 11:35:23 2020 +0200

    Merge branch 'master' into jira/solr-14423

 lucene/CHANGES.txt                                 |   14 +
 .../java/org/apache/lucene/codecs/CodecUtil.java   |   21 +-
 .../apache/lucene/codecs/DocValuesConsumer.java    |    2 +-
 .../java/org/apache/lucene/index/DocValues.java    |    4 +-
 .../java/org/apache/lucene/index/IndexWriter.java  |    3 +-
 .../org/apache/lucene/index/MultiDocValues.java    |    2 +-
 .../lucene/search/FuzzyAutomatonBuilder.java       |   88 +
 .../java/org/apache/lucene/search/FuzzyQuery.java  |   58 +-
 .../org/apache/lucene/search/FuzzyTermsEnum.java   |  151 +-
 .../org/apache/lucene/search/MultiTermQuery.java   |    6 +-
 .../org/apache/lucene/codecs/TestCodecUtil.java    |   12 +-
 .../apache/lucene/index/TestIndexWriterReader.java |   15 +-
 .../org/apache/lucene/search/TestFuzzyQuery.java   |   84 +-
 .../org/apache/lucene/util/TestOfflineSorter.java  |   17 +-
 .../lucene/expressions/ExpressionValueSource.java  |    2 +-
 .../expressions/TestExpressionValueSource.java     |   58 +
 lucene/ivy-versions.properties                     |    4 +-
 lucene/licenses/log4j-api-2.11.2.jar.sha1          |    1 -
 lucene/licenses/log4j-api-2.13.2.jar.sha1          |    1 +
 lucene/licenses/log4j-core-2.11.2.jar.sha1         |    1 -
 lucene/licenses/log4j-core-2.13.2.jar.sha1         |    1 +
 solr/CHANGES.txt                                   |   14 +
 .../apache/solr/analytics/ExpressionFactory.java   |   78 +-
 .../apache/solr/analytics/facet/PivotFacet.java    |   77 +-
 .../function/mapping/ComparisonFunction.java       |  320 +-
 .../function/mapping/DateMathFunction.java         |  171 +-
 .../function/mapping/DateParseFunction.java        |  261 +-
 .../mapping/DecimalNumericConversionFunction.java  |  281 +-
 .../analytics/function/mapping/EqualFunction.java  |  301 +-
 .../analytics/function/mapping/ExistsFunction.java |  143 +-
 .../function/mapping/FillMissingFunction.java      | 1283 ++++---
 .../analytics/function/mapping/FilterFunction.java | 1075 +++---
 .../analytics/function/mapping/IfFunction.java     | 1268 +++---
 .../analytics/function/mapping/LambdaFunction.java | 4044 ++++++++++----------
 .../analytics/function/mapping/RemoveFunction.java | 1187 +++---
 .../function/mapping/ReplaceFunction.java          | 1519 ++++----
 .../analytics/function/reduction/MaxFunction.java  |  405 +-
 .../function/reduction/MedianFunction.java         |  237 +-
 .../analytics/function/reduction/MinFunction.java  |  405 +-
 .../function/reduction/OrdinalFunction.java        |  489 +--
 .../function/reduction/PercentileFunction.java     |  453 +--
 .../solr/analytics/util/FacetRangeGenerator.java   |  132 +-
 .../solr/analytics/util/MedianCalculator.java      |    6 +-
 .../solr/analytics/util/OrdinalCalculator.java     |   15 +-
 .../clustering/carrot2/CarrotClusteringEngine.java |    3 +-
 .../client/solrj/embedded/EmbeddedSolrServer.java  |    2 +
 .../org/apache/solr/core/QuerySenderListener.java  |    2 +-
 .../src/java/org/apache/solr/core/SolrCore.java    |    5 +-
 .../solr/handler/component/ExpandComponent.java    |    4 +-
 .../solr/handler/component/QueryComponent.java     |   28 +-
 .../solr/handler/component/ResponseBuilder.java    |    3 +-
 .../solr/handler/component/SearchHandler.java      |    2 +
 .../handler/component/SortedDateStatsValues.java   |    4 +-
 .../component/SortedNumericStatsValues.java        |    4 +-
 .../solr/handler/component/StatsValuesFactory.java | 1379 +++----
 .../solr/handler/tagger/TaggerRequestHandler.java  |    3 +-
 .../apache/solr/response/BinaryResponseWriter.java |    4 +-
 .../solr/response/GeoJSONResponseWriter.java       |   18 +-
 .../apache/solr/response/JSONResponseWriter.java   |    8 +
 .../java/org/apache/solr/response/JSONWriter.java  |   43 +-
 .../solr/response/PHPSerializedResponseWriter.java |   16 +-
 .../org/apache/solr/response/SchemaXmlWriter.java  |    5 +
 .../solr/response/TabularResponseWriter.java       |    7 +
 .../apache/solr/response/TextResponseWriter.java   |   16 +-
 .../java/org/apache/solr/response/XMLWriter.java   |   22 +
 .../response/transform/DocIdAugmenterFactory.java  |   31 +-
 .../transform/SubQueryAugmenterFactory.java        |    4 +-
 .../src/java/org/apache/solr/schema/BoolField.java |  145 +-
 .../org/apache/solr/schema/DatePointField.java     |   49 +-
 .../src/java/org/apache/solr/search/DocList.java   |    3 +
 .../src/java/org/apache/solr/search/DocSlice.java  |   13 +-
 .../org/apache/solr/search/FunctionQParser.java    |    6 +-
 .../src/java/org/apache/solr/search/Grouping.java  |    6 +-
 .../org/apache/solr/search/MaxScoreCollector.java  |    4 +-
 .../java/org/apache/solr/search/QueryCommand.java  |   10 +
 .../org/apache/solr/search/QueryResultKey.java     |   15 +-
 .../org/apache/solr/search/SolrIndexSearcher.java  |   29 +-
 .../org/apache/solr/search/ValueSourceParser.java  |  637 ++-
 .../apache/solr/search/facet/AggValueSource.java   |    2 +-
 .../java/org/apache/solr/search/facet/AvgAgg.java  |    8 +-
 .../org/apache/solr/search/facet/CountAgg.java     |    2 +-
 .../org/apache/solr/search/facet/CountValsAgg.java |   10 +-
 .../org/apache/solr/search/facet/DocValuesAcc.java |   22 +-
 .../solr/search/facet/FacetFieldProcessor.java     |    8 +-
 .../search/facet/FacetFieldProcessorByArray.java   |    4 +-
 .../search/facet/FacetFieldProcessorByArrayDV.java |    2 +-
 .../facet/FacetFieldProcessorByArrayUIF.java       |    2 +-
 .../FacetFieldProcessorByEnumTermsStream.java      |    2 +-
 .../search/facet/FacetFieldProcessorByHashDV.java  |    2 +-
 .../org/apache/solr/search/facet/FacetModule.java  |    8 +-
 .../apache/solr/search/facet/FacetProcessor.java   |   12 +-
 .../org/apache/solr/search/facet/FacetQuery.java   |    4 +-
 .../org/apache/solr/search/facet/FacetRange.java   |    4 +-
 .../org/apache/solr/search/facet/FacetRequest.java | 1122 +++---
 .../java/org/apache/solr/search/facet/HLLAgg.java  |    8 +-
 .../org/apache/solr/search/facet/MinMaxAgg.java    |   16 +-
 .../org/apache/solr/search/facet/MissingAgg.java   |    4 +-
 .../apache/solr/search/facet/PercentileAgg.java    |   12 +-
 .../apache/solr/search/facet/RelatednessAgg.java   |    6 +-
 .../java/org/apache/solr/search/facet/SlotAcc.java |   30 +-
 .../org/apache/solr/search/facet/StddevAgg.java    |    8 +-
 .../java/org/apache/solr/search/facet/SumAgg.java  |    8 +-
 .../org/apache/solr/search/facet/SumsqAgg.java     |    8 +-
 .../solr/search/facet/UnInvertedFieldAcc.java      |    6 +-
 .../org/apache/solr/search/facet/UniqueAgg.java    |    8 +-
 .../apache/solr/search/facet/UniqueBlockAgg.java   |    4 +-
 .../solr/search/facet/UniqueBlockFieldAgg.java     |    2 +-
 .../solr/search/facet/UniqueBlockQueryAgg.java     |    4 +-
 .../solr/search/facet/UniqueMultiDvSlotAcc.java    |    2 +-
 .../search/facet/UniqueMultivaluedSlotAcc.java     |    2 +-
 .../search/facet/UniqueSinglevaluedSlotAcc.java    |    2 +-
 .../apache/solr/search/facet/UniqueSlotAcc.java    |    2 +-
 .../org/apache/solr/search/facet/VarianceAgg.java  |    8 +-
 .../apache/solr/update/DirectUpdateHandler2.java   |   10 +-
 .../org/apache/solr/update/SolrIndexWriter.java    |    2 +-
 .../processor/LogUpdateProcessorFactory.java       |    3 +-
 .../org/apache/solr/BasicFunctionalityTest.java    |    2 +-
 .../test/org/apache/solr/TestCrossCoreJoin.java    |    4 +-
 .../org/apache/solr/TestDistributedSearch.java     |   32 +-
 .../test/org/apache/solr/TestGroupingSearch.java   |  184 +-
 solr/core/src/test/org/apache/solr/TestJoin.java   |   19 +-
 .../org/apache/solr/core/QueryResultKeyTest.java   |   16 +-
 .../org/apache/solr/handler/tagger/TaggerTest.java |    6 +-
 .../test/org/apache/solr/request/TestFaceting.java |   25 +
 .../org/apache/solr/response/JSONWriterTest.java   |    4 +-
 .../response/TestPHPSerializedResponseWriter.java  |    2 +-
 .../apache/solr/search/SolrIndexSearcherTest.java  |  200 +
 .../solr/search/TestAddFieldRealTimeGet.java       |    8 +-
 .../test/org/apache/solr/search/TestDocSet.java    |    3 +-
 .../org/apache/solr/search/TestRealTimeGet.java    |    6 +-
 .../org/apache/solr/search/facet/DebugAgg.java     |    8 +-
 .../solr/search/facet/TestJsonFacetRefinement.java |    2 +-
 .../apache/solr/search/facet/TestJsonFacets.java   |    2 +-
 .../facet/TestJsonFacetsWithNestedObjects.java     |   12 +-
 .../solr/search/join/TestScoreJoinQPNoScore.java   |   23 +-
 .../solr/search/join/TestScoreJoinQPScore.java     |   18 +-
 solr/licenses/commons-cli-1.2.jar.sha1             |    1 -
 solr/licenses/commons-cli-1.4.jar.sha1             |    1 +
 solr/licenses/log4j-1.2-api-2.11.2.jar.sha1        |    1 -
 solr/licenses/log4j-1.2-api-2.13.2.jar.sha1        |    1 +
 solr/licenses/log4j-api-2.11.2.jar.sha1            |    1 -
 solr/licenses/log4j-api-2.13.2.jar.sha1            |    1 +
 solr/licenses/log4j-core-2.11.2.jar.sha1           |    1 -
 solr/licenses/log4j-core-2.13.2.jar.sha1           |    1 +
 solr/licenses/log4j-slf4j-impl-2.11.2.jar.sha1     |    1 -
 solr/licenses/log4j-slf4j-impl-2.13.2.jar.sha1     |    1 +
 solr/licenses/log4j-web-2.11.2.jar.sha1            |    1 -
 solr/licenses/log4j-web-2.13.2.jar.sha1            |    1 +
 .../org/apache/solr/common/SolrDocumentList.java   |   10 +
 .../apache/solr/common/params/CommonParams.java    |    6 +
 .../solr/common/util/FastJavaBinDecoder.java       |    3 +
 .../org/apache/solr/common/util/JavaBinCodec.java  |    9 +-
 .../src/test-files/solrj/javabin_backcompat.bin    |  Bin 169 -> 170 bytes
 .../solr/common/params/CommonParamsTest.java       |    2 +
 .../apache/solr/common/util/TestJavaBinCodec.java  |   45 +-
 versions.lock                                      |   10 +-
 versions.props                                     |    4 +-
 157 files changed, 10060 insertions(+), 9225 deletions(-)