You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2019/12/18 08:52:08 UTC
[lucene-solr] 01/02: Merge with master.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch gradle-master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 28b19c2af276443e785e341b56b02ffed5b59f9d
Merge: 845b202 71a5714
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Wed Dec 18 09:32:35 2019 +0100
Merge with master.
lucene/ivy-versions.properties | 47 +-
lucene/licenses/asm-5.1.jar.sha1 | 1 -
lucene/licenses/asm-7.2.jar.sha1 | 1 +
lucene/licenses/asm-commons-5.1.jar.sha1 | 1 -
lucene/licenses/asm-commons-7.2.jar.sha1 | 1 +
lucene/licenses/commons-codec-1.11.jar.sha1 | 1 -
lucene/licenses/commons-codec-1.13.jar.sha1 | 1 +
lucene/licenses/commons-compress-1.18.jar.sha1 | 1 -
lucene/licenses/commons-compress-1.19.jar.sha1 | 1 +
lucene/licenses/httpclient-4.5.10.jar.sha1 | 1 +
lucene/licenses/httpclient-4.5.6.jar.sha1 | 1 -
lucene/licenses/httpcore-4.4.10.jar.sha1 | 1 -
lucene/licenses/httpcore-4.4.12.jar.sha1 | 1 +
lucene/licenses/xercesImpl-2.12.0.jar.sha1 | 1 +
lucene/licenses/xercesImpl-2.9.1.jar.sha1 | 1 -
solr/CHANGES.txt | 28 +-
solr/contrib/extraction/ivy.xml | 1 +
.../java/org/apache/solr/handler/CatStream.java | 2 +-
.../java/org/apache/solr/search/QParserPlugin.java | 4 +
.../search/join/BlockJoinDocSetFacetComponent.java | 195 -------
.../solr/search/join/BlockJoinFacetAccsHolder.java | 83 ---
.../solr/search/join/BlockJoinFacetComponent.java | 23 -
.../join/BlockJoinFacetComponentSupport.java | 158 -----
.../solr/search/join/BlockJoinFacetFilter.java | 96 ----
.../join/BlockJoinFieldFacetAccumulator.java | 235 --------
.../solr/search/join/BlockJoinParentQParser.java | 1 +
.../search/join/ChildFieldValueSourceParser.java | 7 +-
.../{BitSetSlice.java => HashRangeQParser.java} | 38 +-
...itSetSlice.java => HashRangeQParserPlugin.java} | 37 +-
.../apache/solr/search/join/HashRangeQuery.java | 144 +++++
.../apache/solr/search/join/ScoreModeParser.java | 1 +
.../org/apache/solr/search/join/XCJFQParser.java | 90 +++
.../apache/solr/search/join/XCJFQParserPlugin.java | 66 +++
.../org/apache/solr/search/join/XCJFQuery.java | 380 ++++++++++++
.../conf/schema-blockjoinfacetcomponent.xml | 40 --
.../conf/solrconfig-blockjoinfacetcomponent.xml | 58 --
.../solr/configsets/xcjf/conf/schema.xml | 32 ++
.../solr/configsets/xcjf/conf/solrconfig.xml | 72 +++
.../solr/handler/admin/LoggingHandlerTest.java | 59 +-
.../solr/search/DelayingSearchComponent.java | 31 +-
.../org/apache/solr/search/QueryEqualityTest.java | 244 ++++----
.../org/apache/solr/search/join/BJQParserTest.java | 6 +-
.../search/join/BlockJoinFacetDistribTest.java | 237 --------
.../solr/search/join/BlockJoinFacetRandomTest.java | 637 ---------------------
.../solr/search/join/BlockJoinFacetSimpleTest.java | 121 ----
.../solr/search/join/TestScoreJoinQPNoScore.java | 5 +-
.../solr/search/join/TestScoreJoinQPScore.java | 4 +-
.../org/apache/solr/search/join/XCJFQueryTest.java | 280 +++++++++
.../join/another/BJQFilterAccessibleTest.java | 3 +-
.../processor/RoutedAliasUpdateProcessorTest.java | 1 +
solr/licenses/apache-mime4j-core-0.8.2.jar.sha1 | 1 -
solr/licenses/apache-mime4j-core-0.8.3.jar.sha1 | 1 +
solr/licenses/apache-mime4j-dom-0.8.2.jar.sha1 | 1 -
solr/licenses/apache-mime4j-dom-0.8.3.jar.sha1 | 1 +
solr/licenses/asm-5.1.jar.sha1 | 1 -
solr/licenses/asm-7.2.jar.sha1 | 1 +
solr/licenses/asm-commons-5.1.jar.sha1 | 1 -
solr/licenses/asm-commons-7.2.jar.sha1 | 1 +
solr/licenses/bcmail-jdk15on-1.60.jar.sha1 | 1 -
solr/licenses/bcmail-jdk15on-1.64.jar.sha1 | 1 +
solr/licenses/bcpkix-jdk15on-1.60.jar.sha1 | 1 -
solr/licenses/bcpkix-jdk15on-1.64.jar.sha1 | 1 +
solr/licenses/bcprov-jdk15on-1.60.jar.sha1 | 1 -
solr/licenses/bcprov-jdk15on-1.64.jar.sha1 | 1 +
solr/licenses/commons-codec-1.11.jar.sha1 | 1 -
solr/licenses/commons-codec-1.13.jar.sha1 | 1 +
solr/licenses/commons-compress-1.18.jar.sha1 | 1 -
solr/licenses/commons-compress-1.19.jar.sha1 | 1 +
solr/licenses/commons-csv-1.7.jar.sha1 | 1 +
solr/licenses/commons-csv-LICENSE-ASL.txt | 202 +++++++
solr/licenses/commons-csv-NOTICE.txt | 9 +
solr/licenses/commons-io-2.5.jar.sha1 | 1 -
solr/licenses/commons-io-2.6.jar.sha1 | 1 +
solr/licenses/commons-lang3-3.8.1.jar.sha1 | 1 -
solr/licenses/commons-lang3-3.9.jar.sha1 | 1 +
solr/licenses/curvesapi-1.04.jar.sha1 | 1 -
solr/licenses/curvesapi-1.06.jar.sha1 | 1 +
solr/licenses/fontbox-2.0.12.jar.sha1 | 1 -
solr/licenses/fontbox-2.0.17.jar.sha1 | 1 +
solr/licenses/httpclient-4.5.10.jar.sha1 | 1 +
solr/licenses/httpclient-4.5.6.jar.sha1 | 1 -
solr/licenses/httpcore-4.4.10.jar.sha1 | 1 -
solr/licenses/httpcore-4.4.12.jar.sha1 | 1 +
solr/licenses/httpmime-4.5.10.jar.sha1 | 1 +
solr/licenses/httpmime-4.5.6.jar.sha1 | 1 -
solr/licenses/jackcess-2.1.12.jar.sha1 | 1 -
solr/licenses/jackcess-3.0.1.jar.sha1 | 1 +
solr/licenses/jackcess-encrypt-2.1.4.jar.sha1 | 1 -
solr/licenses/jackcess-encrypt-3.0.0.jar.sha1 | 1 +
solr/licenses/jackson-annotations-2.10.0.jar.sha1 | 1 -
solr/licenses/jackson-annotations-2.10.1.jar.sha1 | 1 +
solr/licenses/jackson-core-2.10.0.jar.sha1 | 1 -
solr/licenses/jackson-core-2.10.1.jar.sha1 | 1 +
solr/licenses/jackson-databind-2.10.0.jar.sha1 | 1 -
solr/licenses/jackson-databind-2.10.1.jar.sha1 | 1 +
.../jackson-dataformat-smile-2.10.0.jar.sha1 | 1 -
.../jackson-dataformat-smile-2.10.1.jar.sha1 | 1 +
solr/licenses/jsoup-1.11.3.jar.sha1 | 1 -
solr/licenses/jsoup-1.12.1.jar.sha1 | 1 +
solr/licenses/parso-2.0.11.jar.sha1 | 1 +
solr/licenses/parso-2.0.9.jar.sha1 | 1 -
solr/licenses/pdfbox-2.0.12.jar.sha1 | 1 -
solr/licenses/pdfbox-2.0.17.jar.sha1 | 1 +
solr/licenses/pdfbox-tools-2.0.12.jar.sha1 | 1 -
solr/licenses/pdfbox-tools-2.0.17.jar.sha1 | 1 +
solr/licenses/poi-4.0.0.jar.sha1 | 1 -
solr/licenses/poi-4.1.1.jar.sha1 | 1 +
solr/licenses/poi-ooxml-4.0.0.jar.sha1 | 1 -
solr/licenses/poi-ooxml-4.1.1.jar.sha1 | 1 +
solr/licenses/poi-ooxml-schemas-4.0.0.jar.sha1 | 1 -
solr/licenses/poi-ooxml-schemas-4.1.1.jar.sha1 | 1 +
solr/licenses/poi-scratchpad-4.0.0.jar.sha1 | 1 -
solr/licenses/poi-scratchpad-4.1.1.jar.sha1 | 1 +
solr/licenses/protobuf-java-3.11.0.jar.sha1 | 1 +
solr/licenses/protobuf-java-3.6.1.jar.sha1 | 1 -
solr/licenses/rome-1.12.2.jar.sha1 | 1 +
solr/licenses/rome-1.5.1.jar.sha1 | 1 -
solr/licenses/rome-utils-1.12.2.jar.sha1 | 1 +
solr/licenses/rome-utils-1.5.1.jar.sha1 | 1 -
solr/licenses/tika-core-1.19.1.jar.sha1 | 1 -
solr/licenses/tika-core-1.23.jar.sha1 | 1 +
solr/licenses/tika-java7-1.19.1.jar.sha1 | 1 -
solr/licenses/tika-java7-1.23.jar.sha1 | 1 +
solr/licenses/tika-parsers-1.19.1.jar.sha1 | 1 -
solr/licenses/tika-parsers-1.23.jar.sha1 | 1 +
solr/licenses/tika-xmp-1.19.1.jar.sha1 | 1 -
solr/licenses/tika-xmp-1.23.jar.sha1 | 1 +
solr/licenses/xercesImpl-2.12.0.jar.sha1 | 1 +
solr/licenses/xercesImpl-2.9.1.jar.sha1 | 1 -
solr/licenses/xmlbeans-3.0.1.jar.sha1 | 1 -
solr/licenses/xmlbeans-3.1.0.jar.sha1 | 1 +
solr/solr-ref-guide/src/aliases.adoc | 2 +-
.../authentication-and-authorization-plugins.adoc | 2 +-
solr/solr-ref-guide/src/blockjoin-faceting.adoc | 115 ----
.../src/cluster-node-management.adoc | 6 +-
solr/solr-ref-guide/src/collection-management.adoc | 32 +-
.../solr-ref-guide/src/command-line-utilities.adoc | 2 +-
.../src/common-query-parameters.adoc | 4 +-
solr/solr-ref-guide/src/config-sets.adoc | 4 +-
solr/solr-ref-guide/src/configsets-api.adoc | 2 +-
solr/solr-ref-guide/src/coreadmin-api.adoc | 4 +-
.../src/defining-core-properties.adoc | 2 +-
solr/solr-ref-guide/src/distributed-requests.adoc | 4 +-
solr/solr-ref-guide/src/enabling-ssl.adoc | 2 +-
solr/solr-ref-guide/src/faceting.adoc | 1 -
solr/solr-ref-guide/src/format-of-solr-xml.adoc | 6 +-
.../src/implicit-requesthandlers.adoc | 2 +-
.../src/json-faceting-domain-changes.adoc | 2 +-
solr/solr-ref-guide/src/json-query-dsl.adoc | 2 +-
.../src/jwt-authentication-plugin.adoc | 2 +-
.../src/major-changes-in-solr-7.adoc | 4 +-
.../src/major-changes-in-solr-8.adoc | 2 +-
solr/solr-ref-guide/src/other-parsers.adoc | 104 ++++
.../src/package-manager-internals.adoc | 43 +-
solr/solr-ref-guide/src/package-manager.adoc | 31 +-
.../src/performance-statistics-reference.adoc | 4 +-
solr/solr-ref-guide/src/resource-loading.adoc | 6 +-
.../src/searching-nested-documents.adoc | 2 +-
solr/solr-ref-guide/src/securing-solr.adoc | 4 +-
.../src/solr-control-script-reference.adoc | 4 +-
.../src/solr-cores-and-solr-xml.adoc | 2 +-
solr/solr-ref-guide/src/solr-upgrade-notes.adoc | 134 ++++-
.../solrcloud-autoscaling-policy-preferences.adoc | 18 +-
.../src/solrcloud-autoscaling-triggers.adoc | 4 +-
.../solrcloud-configuration-and-parameters.adoc | 2 +-
solr/solr-ref-guide/src/solrcloud.adoc | 2 +-
.../src/the-dismax-query-parser.adoc | 12 +-
.../src/updating-parts-of-documents.adoc | 2 +-
...ng-zookeeper-to-manage-configuration-files.adoc | 2 +-
.../src/java/org/apache/solr/util/LogLevel.java | 33 +-
.../org/apache/solr/TestLogLevelAnnotations.java | 113 +++-
171 files changed, 2088 insertions(+), 2406 deletions(-)