lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [lucene-solr] 35/36: Merge branch 'master' into jira/solr-13579
Date Wed, 18 Dec 2019 16:39:13 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit cb7d8351e2a31091a7eea860abaa1ddb3e5620ac
Merge: f1ebfdc 56839f6
Author: Andrzej Bialecki <ab@apache.org>
AuthorDate: Wed Dec 18 15:51:36 2019 +0100

    Merge branch 'master' into jira/solr-13579

 lucene/CHANGES.txt                                 |   4 +-
 .../analysis/cn/smart/hhmm/BigramDictionary.java   |   3 +
 .../analysis/cn/smart/hhmm/WordDictionary.java     |   3 +
 .../src/java/org/apache/lucene/geo/EdgeTree.java   |  44 +-
 .../src/java/org/apache/lucene/geo/Polygon2D.java  |   8 +-
 .../facet/taxonomy/writercache/CharBlockArray.java |   4 +
 lucene/ivy-versions.properties                     |  51 +-
 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 -
 .../lucene/replicator/http/HttpClientBase.java     |   2 +
 .../lucene/replicator/http/ReplicationService.java |   2 +
 .../src/java/org/apache/lucene/geo/Line2D.java     |   2 +-
 .../apache/lucene/document/TestLatLonShape.java    |  40 +
 lucene/tools/forbiddenApis/base.txt                |   4 +
 solr/CHANGES.txt                                   |  31 +-
 .../stream/AnalyticsShardResponseParser.java       |   2 +
 .../response/AnalyticsShardResponseWriter.java     |   2 +
 .../solr/handler/dataimport/ScriptTransformer.java |  33 +-
 .../handler/dataimport/TestScriptTransformer.java  |  22 +
 solr/contrib/extraction/ivy.xml                    |   1 +
 solr/core/ivy.xml                                  |   4 -
 .../java/org/apache/solr/handler/CatStream.java    |   2 +-
 .../solr/handler/admin/SystemInfoHandler.java      |  45 -
 .../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 +++++++++
 .../StatelessScriptUpdateProcessorFactory.java     |  33 +-
 .../src/test-files/solr/collection1/conf/evil.js   |  21 +
 .../conf/schema-blockjoinfacetcomponent.xml        |  40 -
 .../conf/solrconfig-blockjoinfacetcomponent.xml    |  58 --
 .../conf/solrconfig-script-updateprocessor.xml     |   6 +
 .../solr/configsets/xcjf/conf/schema.xml           |  32 +
 .../solr/configsets/xcjf/conf/solrconfig.xml       |  72 ++
 .../solr/cloud/FullSolrCloudDistribCmdsTest.java   | 946 ++++++++-------------
 .../solr/handler/admin/LoggingHandlerTest.java     |  54 +-
 .../org/apache/solr/rest/TestManagedResource.java  |   5 +
 .../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 +
 .../StatelessScriptUpdateProcessorFactoryTest.java |  10 +
 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-LICENSE-BSD.txt                  |   2 +-
 solr/licenses/asm-LICENSE-BSD_LIKE.txt             |  26 -
 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 +
 .../licenses/commons-configuration-LICENSE-ASL.txt | 403 ---------
 solr/licenses/commons-configuration-NOTICE.txt     |   9 -
 solr/licenses/commons-csv-1.7.jar.sha1             |   1 +
 ...LICENSE-ASL.txt => commons-csv-LICENSE-ASL.txt} |   0
 ...-digester-NOTICE.txt => commons-csv-NOTICE.txt} |   8 +-
 solr/licenses/commons-digester-LICENSE-ASL.txt     | 202 -----
 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/hadoop-common-tests-LICENSE-ASL.txt  | 244 ------
 solr/licenses/hadoop-common-tests-NOTICE.txt       |   2 -
 solr/licenses/hadoop-hdfs-tests-LICENSE-ASL.txt    | 244 ------
 solr/licenses/hadoop-hdfs-tests-NOTICE.txt         |   2 -
 solr/licenses/hadoop-minicluster-3.2.0.jar.sha1    |   1 -
 solr/licenses/hadoop-minicluster-LICENSE-ASL.txt   | 244 ------
 solr/licenses/hadoop-minicluster-NOTICE.txt        |   2 -
 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-core-asl-LICENSE-ASL.txt     | 202 -----
 solr/licenses/jackson-core-asl-NOTICE.txt          |   7 -
 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/jackson-mapper-asl-LICENSE-ASL.txt   | 202 -----
 solr/licenses/jackson-mapper-asl-NOTICE.txt        |   7 -
 solr/licenses/jersey-core-1.19.jar.sha1            |   1 -
 solr/licenses/jersey-core-LICENSE-CDDL.txt         |  81 --
 solr/licenses/jersey-server-1.19.jar.sha1          |   1 -
 solr/licenses/jersey-server-LICENSE-CDDL.txt       |  85 --
 solr/licenses/jsoup-1.11.3.jar.sha1                |   1 -
 solr/licenses/jsoup-1.12.1.jar.sha1                |   1 +
 solr/licenses/metrics-json-LICENSE-ASL.txt         | 203 -----
 solr/licenses/metrics-json-NOTICE.txt              |  12 -
 solr/licenses/metrics-servlets-LICENSE-ASL.txt     | 203 -----
 solr/licenses/metrics-servlets-NOTICE.txt          |  12 -
 solr/licenses/mina-core-LICENSE-ASL.txt            | 341 --------
 solr/licenses/mina-core-NOTICE.txt                 |   7 -
 solr/licenses/netty-all-4.1.29.Final.jar.sha1      |   1 -
 solr/licenses/netty-all-LICENSE-ASL.txt            | 202 -----
 solr/licenses/netty-all-NOTICE.txt                 | 223 -----
 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/presto-parser-LICENSE-ASL.txt        | 202 -----
 solr/licenses/presto-parser-NOTICE.txt             |   0
 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/servlet-api-LICENSE-CDDL.txt         | 126 ---
 solr/licenses/servlet-api-NOTICE.txt               |   2 -
 solr/licenses/slice-NOTICE.txt                     |   0
 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 +-
 .../org/apache/solr/client/solrj/SolrResponse.java |   3 +
 .../apache/solr/client/solrj/SolrQueryTest.java    |   3 +
 .../src/java/org/apache/solr/util/LogLevel.java    |  33 +-
 .../org/apache/solr/TestLogLevelAnnotations.java   | 113 ++-
 solr/webapp/web/js/angular/controllers/index.js    |   8 +-
 solr/webapp/web/partials/index.html                |   2 +-
 232 files changed, 2460 insertions(+), 6595 deletions(-)


Mime
View raw message