You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2020/07/03 02:13:07 UTC

[lucene-solr] branch jira/solr14610 updated (f8193f7 -> c0edf73)

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

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


    from f8193f7  SOLR-14610: ReflectMapWriter to use VarHandle instead of reflection
     add 1f6de31  SOLR-14539 Ref Guide update {!bool excludeTags}
     add 76e1d90  SOLR-14592: Upgrade Zookeeper to 3.6.1
     add d0864a1  SOLR-14523: Enhance gradle logging calls validation: eliminate getMessage()
     add 2e60e1f  SOLR-14404: Unregister was not working for plugins with $path-prefix
     add ccdfee2  Remove Redundant Import in TestContainerPlugin
     add 3f9cc22  SOLR-14588: Implement Circuit Breakers (#1626)
     add 7c593b1  SOLR-14022: Deprecate CDCR
     add dd6d1c9  SOLR-14066: Deprecate DIH
     add cc9df5a  SOLR-14561: Adding upgrade notes for allowPaths (#1641)
     add 257a185  SOLR-14561: Fix silly mistake in refguide link
     add 1b8fb70  SOLR-14537: Improve performance of ExportWriter.
     add b50dd0c  SOLR-14358 respond to feedback on URLClassifyProcessorFactory (#1632)
     add 2005c43  fix link and wordsmith a bit (#1642)
     add c0edf73  Merge branch 'master' into jira/solr14610

No new revisions were added by this update.

Summary of changes:
 gradle/hacks/findbugs.gradle                       |   3 +-
 lucene/ivy-versions.properties                     |  12 +-
 .../handler/dataimport/MailEntityProcessor.java    |   6 +-
 .../src/java/overview.html                         |   2 +-
 solr/contrib/dataimporthandler/README.md           |   9 +
 .../solr/handler/dataimport/DataImportHandler.java |   3 +
 .../dataimporthandler/src/java/overview.html       |   2 +-
 .../TestSolrEntityProcessorEndToEnd.java           |  16 +-
 .../test/org/apache/solr/ltr/TestRerankBase.java   |  25 --
 .../solr/prometheus/scraper/SolrScraper.java       |   2 +-
 solr/core/build.gradle                             |   3 +
 .../apache/solr/api/CustomContainerPlugins.java    |  19 +-
 .../java/org/apache/solr/cloud/SolrZkServer.java   |  70 ----
 .../java/org/apache/solr/cloud/ZkController.java   |   5 +-
 .../autoscaling/InactiveMarkersPlanAction.java     |   2 +-
 .../cloud/autoscaling/OverseerTriggerThread.java   |   4 +-
 .../org/apache/solr/core/ConfigSetProperties.java  |   2 +-
 .../java/org/apache/solr/core/CoreContainer.java   |   2 +-
 .../apache/solr/core/CorePropertiesLocator.java    |   4 +-
 .../src/java/org/apache/solr/core/SolrConfig.java  |  19 ++
 .../src/java/org/apache/solr/core/SolrCore.java    |  16 +-
 .../src/java/org/apache/solr/core/SolrPaths.java   |   2 +-
 .../java/org/apache/solr/core/SolrXmlConfig.java   |   2 +-
 .../solr/core/TransientSolrCoreCacheFactory.java   |   6 +-
 .../solr/handler/CdcrBufferStateManager.java       |   2 +
 .../solr/handler/CdcrLeaderStateManager.java       |   2 +
 .../solr/handler/CdcrProcessStateManager.java      |   2 +
 .../org/apache/solr/handler/CdcrReplicator.java    |   2 +
 .../apache/solr/handler/CdcrReplicatorManager.java |   1 +
 .../apache/solr/handler/CdcrReplicatorState.java   |   2 +-
 .../apache/solr/handler/CdcrRequestHandler.java    |   4 +
 .../solr/handler/CdcrUpdateLogSynchronizer.java    |   8 +-
 .../org/apache/solr/handler/ExportHandler.java     |  14 +-
 .../apache/solr/handler/MoreLikeThisHandler.java   |   2 +-
 .../org/apache/solr/handler/SolrConfigHandler.java |   2 +-
 .../solr/handler/component/SearchHandler.java      |  32 +-
 .../solr/handler/export/DoubleValueSortDoc.java    |   1 +
 .../apache/solr/handler/export/ExportBuffers.java  | 268 +++++++++++++++
 .../apache/solr/handler/export/ExportWriter.java   | 373 ++++++++-------------
 .../solr/handler/export/ExportWriterStream.java    | 242 +++++++++++++
 .../org/apache/solr/handler/export/LongValue.java  |   4 +-
 .../apache/solr/handler/export/PriorityQueue.java  | 218 ------------
 .../solr/handler/export/QuadValueSortDoc.java      |   1 +
 .../solr/handler/export/SingleValueSortDoc.java    |   8 +-
 .../org/apache/solr/handler/export/SortDoc.java    |  23 +-
 .../org/apache/solr/handler/export/SortQueue.java  | 155 ++++++++-
 .../solr/handler/export/StringFieldWriter.java     |  13 +-
 .../apache/solr/handler/export/StringValue.java    |  14 +-
 .../solr/handler/export/TripleValueSortDoc.java    |   1 +
 .../src/java/org/apache/solr/pkg/PackageAPI.java   |   2 +-
 .../src/java/org/apache/solr/search/Grouping.java  |   2 +-
 .../org/apache/solr/search/SolrIndexSearcher.java  |   2 +-
 .../solr/search/grouping/CommandHandler.java       |   2 +-
 .../security/Sha256AuthenticationProvider.java     |   2 +-
 .../java/org/apache/solr/servlet/HttpSolrCall.java |   4 +-
 .../org/apache/solr/update/CdcrTransactionLog.java |   2 +
 .../java/org/apache/solr/update/HdfsUpdateLog.java |   2 +-
 .../src/java/org/apache/solr/update/UpdateLog.java |   2 +-
 .../processor/AtomicUpdateProcessorFactory.java    |   3 +-
 .../solr/update/processor/CdcrUpdateProcessor.java |   2 +
 ...DocBasedVersionConstraintsProcessorFactory.java |   2 +-
 .../DocExpirationUpdateProcessorFactory.java       |   6 +-
 .../update/processor/TolerantUpdateProcessor.java  |   2 +-
 .../update/processor/URLClassifyProcessor.java     |  12 +-
 .../src/java/org/apache/solr/util/SolrCLI.java     |  17 +-
 .../solr/util/circuitbreaker/CircuitBreaker.java   |  56 ++++
 .../util/circuitbreaker/CircuitBreakerManager.java | 134 ++++++++
 .../util/circuitbreaker/MemoryCircuitBreaker.java  | 114 +++++++
 .../resources/EditableSolrConfigAttributes.json    |   2 +
 .../conf/solrconfig-memory-circuitbreaker.xml      |  95 ++++++
 .../apache/solr/cloud/CollectionsAPISolrJTest.java |   4 +-
 .../solr/cloud/TestConfigSetsAPIZkFailure.java     |  28 +-
 .../api/collections/CollectionReloadTest.java      |   2 +-
 .../CollectionsAPIAsyncDistributedZkTest.java      |   2 +-
 .../test/org/apache/solr/core/SolrCoreTest.java    |   2 +
 .../org/apache/solr/core/TestConfigOverlay.java    |   2 +
 .../apache/solr/handler/TestContainerPlugin.java   |  29 ++
 .../solr/handler/export/TestExportWriter.java      |  31 +-
 .../apache/solr/schema/ChangedSchemaMergeTest.java |   4 +-
 .../update/processor/URLClassifyProcessorTest.java |   2 +
 .../org/apache/solr/util/TestCircuitBreaker.java   | 218 ++++++++++++
 solr/example/example-DIH/README.md                 |   2 +
 solr/example/files/conf/solrconfig.xml             |  38 +++
 solr/licenses/commons-lang-2.6.jar.sha1            |   1 +
 .../commons-lang-LICENSE-ASL.txt}                  |   0
 solr/licenses/commons-lang-NOTICE.txt              |   5 +
 solr/licenses/netty-buffer-4.1.47.Final.jar.sha1   |   1 -
 solr/licenses/netty-buffer-4.1.50.Final.jar.sha1   |   1 +
 solr/licenses/netty-codec-4.1.47.Final.jar.sha1    |   1 -
 solr/licenses/netty-codec-4.1.50.Final.jar.sha1    |   1 +
 solr/licenses/netty-common-4.1.47.Final.jar.sha1   |   1 -
 solr/licenses/netty-common-4.1.50.Final.jar.sha1   |   1 +
 solr/licenses/netty-handler-4.1.47.Final.jar.sha1  |   1 -
 solr/licenses/netty-handler-4.1.50.Final.jar.sha1  |   1 +
 solr/licenses/netty-resolver-4.1.47.Final.jar.sha1 |   1 -
 solr/licenses/netty-resolver-4.1.50.Final.jar.sha1 |   1 +
 .../licenses/netty-transport-4.1.47.Final.jar.sha1 |   1 -
 .../licenses/netty-transport-4.1.50.Final.jar.sha1 |   1 +
 ...ty-transport-native-epoll-4.1.47.Final.jar.sha1 |   1 -
 ...ty-transport-native-epoll-4.1.50.Final.jar.sha1 |   1 +
 ...nsport-native-unix-common-4.1.47.Final.jar.sha1 |   1 -
 ...nsport-native-unix-common-4.1.50.Final.jar.sha1 |   1 +
 solr/licenses/snappy-java-1.1.7.6.jar.sha1         |   1 +
 .../snappy-java-LICENSE-ASL.txt}                   |   0
 solr/licenses/snappy-java-NOTICE.txt               |  17 +
 solr/licenses/zookeeper-3.5.7.jar.sha1             |   1 -
 solr/licenses/zookeeper-3.6.1.jar.sha1             |   1 +
 solr/licenses/zookeeper-jute-3.5.7.jar.sha1        |   1 -
 solr/licenses/zookeeper-jute-3.6.1.jar.sha1        |   1 +
 .../solr/configsets/_default/conf/solrconfig.xml   |  59 ++++
 .../conf/solrconfig.xml                            |  42 +++
 solr/solr-ref-guide/src/circuit-breakers.adoc      |  68 ++++
 solr/solr-ref-guide/src/config-api.adoc            |   7 +
 .../src/cross-data-center-replication-cdcr.adoc    |   2 +
 solr/solr-ref-guide/src/dataimport-screen.adoc     |   2 +
 solr/solr-ref-guide/src/exporting-result-sets.adoc |   2 +
 solr/solr-ref-guide/src/index.adoc                 |   3 +
 solr/solr-ref-guide/src/json-query-dsl.adoc        |  24 ++
 solr/solr-ref-guide/src/other-parsers.adoc         |  24 ++
 .../src/query-settings-in-solrconfig.adoc          |  20 ++
 solr/solr-ref-guide/src/solr-upgrade-notes.adoc    |  14 +
 ...ta-store-data-with-the-data-import-handler.adoc |   2 +
 solr/solr-ref-guide/src/using-solrj.adoc           |  10 +-
 solr/solrj/ivy.xml                                 |   4 +
 .../solrj/impl/SolrClientNodeStateProvider.java    |   2 +-
 .../solr/client/solrj/impl/XMLResponseParser.java  |   2 +-
 .../org/apache/solr/client/solrj/io/Tuple.java     |  17 +
 .../apache/solr/common/cloud/ZkStateReader.java    |  14 +-
 .../org/apache/solr/common/util/RetryUtil.java     |   2 +-
 .../apache/solr/common/util/XMLErrorLogger.java    |   2 +-
 .../solr/client/solrj/LargeVolumeTestBase.java     |   2 +-
 .../java/org/apache/solr/cloud/ZkTestServer.java   |   5 +-
 solr/webapp/web/css/angular/dataimport.css         |   3 +-
 solr/webapp/web/partials/dataimport.html           |   1 +
 versions.lock                                      |  22 +-
 versions.props                                     |   7 +-
 136 files changed, 2146 insertions(+), 719 deletions(-)
 create mode 100644 solr/core/src/java/org/apache/solr/handler/export/ExportBuffers.java
 create mode 100644 solr/core/src/java/org/apache/solr/handler/export/ExportWriterStream.java
 delete mode 100644 solr/core/src/java/org/apache/solr/handler/export/PriorityQueue.java
 create mode 100644 solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java
 create mode 100644 solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
 create mode 100644 solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java
 create mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-memory-circuitbreaker.xml
 create mode 100644 solr/core/src/test/org/apache/solr/util/TestCircuitBreaker.java
 create mode 100644 solr/licenses/commons-lang-2.6.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/commons-lang-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 create mode 100644 solr/licenses/commons-lang-NOTICE.txt
 delete mode 100644 solr/licenses/netty-buffer-4.1.47.Final.jar.sha1
 create mode 100644 solr/licenses/netty-buffer-4.1.50.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-codec-4.1.47.Final.jar.sha1
 create mode 100644 solr/licenses/netty-codec-4.1.50.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-common-4.1.47.Final.jar.sha1
 create mode 100644 solr/licenses/netty-common-4.1.50.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-handler-4.1.47.Final.jar.sha1
 create mode 100644 solr/licenses/netty-handler-4.1.50.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-resolver-4.1.47.Final.jar.sha1
 create mode 100644 solr/licenses/netty-resolver-4.1.50.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-4.1.47.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-4.1.50.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-native-epoll-4.1.47.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-native-epoll-4.1.50.Final.jar.sha1
 delete mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.47.Final.jar.sha1
 create mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.50.Final.jar.sha1
 create mode 100644 solr/licenses/snappy-java-1.1.7.6.jar.sha1
 copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/snappy-java-LICENSE-ASL.txt} (100%)
 mode change 100755 => 100644
 create mode 100644 solr/licenses/snappy-java-NOTICE.txt
 delete mode 100644 solr/licenses/zookeeper-3.5.7.jar.sha1
 create mode 100644 solr/licenses/zookeeper-3.6.1.jar.sha1
 delete mode 100644 solr/licenses/zookeeper-jute-3.5.7.jar.sha1
 create mode 100644 solr/licenses/zookeeper-jute-3.6.1.jar.sha1
 create mode 100644 solr/solr-ref-guide/src/circuit-breakers.adoc