You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2020/06/30 06:58:50 UTC
[lucene-solr] branch jira/SOLR-14354 updated (593b87c -> 1110af2)
This is an automated email from the ASF dual-hosted git repository.
datcm pushed a change to branch jira/SOLR-14354
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 593b87c Fix precommit
add 74ac97e SOLR-14588: Follow Up Fixes and Documentation (#1615)
add 68a9e8f SOLR-14376: remove no-longer-needed 'not no filter queries' check in SolrFeatureWeight
add 455f2e6 SOLR-13286 Quiet down metrics logging, add a marker to allow any handler to be silenced via log4j2.xml
add b7f8baa SOLR-13286 changes comment to correct section
add e6ffa8e SOLR-14598: Granting reflection access for using annotations in SOLR-14404
add 20f39b9 Revert "SOLR-14598: Granting reflection access for using annotations in SOLR-14404"
add 80bc86d SOLR Revert change in path separator exposed by cat() Previous change *should* have been purely a refactor but accidentally changed the path separator this streaming expression exposed to always be '/'. Apparently this is controversial so the previous behavior is re-instated here (and fixes a failing test on Windows).
add 45763b6 Revert "SOLR-14588: Follow Up Fixes and Documentation (#1615)"
add 529faf1 Revert "SOLR-14588: Implement Circuit Breakers (#1606)"
add 698c9cc Revert "CHANGES.txt entry for SOLR-14588"
add 7f352a9 LUCENE-8962: Merge small segments on commit (#1617)
add fb3c5d2 LUCENE-8962: Fix changes entry. This feature is added to 8.6
add 1590ed5 SOLR-14404: support for openResource() in PackageResourceLoader & path-prefix for container plugins
add 584e4d5 syncing with branch_8x
add 3377b09 LUCENE-8962: Ensure we never flush by ram buffer or doc count in test
add 7bb9926 SOLR-14481: Add drill Streaming Expression
add 94684cc SOLR-14481: precommit error
add d883cd6 SOLR-14481: use classloader to open resource
add 574e399 SOLR-14588: Fix failing DebugComponentTest by reverting test to pre-patch state
add 49a3f0a SOLR-14561 Followup - validate params for more core operations (#1629)
add 0cef29f LUCENE-9417: Tessellator might fail when several holes share are connected to the same vertex (#1614)
add 0cc45f6 SOLR-14481: Update CHANGES.txt
add 1110af2 Merge branch 'master' into jira/SOLR-14354
No new revisions were added by this update.
Summary of changes:
lucene/CHANGES.txt | 7 +
.../java/org/apache/lucene/geo/Tessellator.java | 11 +-
.../org/apache/lucene/index/FilterMergePolicy.java | 5 +
.../java/org/apache/lucene/index/IndexWriter.java | 280 +++++++++++++++------
.../org/apache/lucene/index/IndexWriterConfig.java | 18 ++
.../apache/lucene/index/LiveIndexWriterConfig.java | 13 +
.../java/org/apache/lucene/index/MergePolicy.java | 97 ++++++-
.../java/org/apache/lucene/index/MergeTrigger.java | 7 +-
.../org/apache/lucene/index/NoMergePolicy.java | 3 +
.../lucene/index/OneMergeWrappingMergePolicy.java | 5 +
.../org/apache/lucene/index/ReadersAndUpdates.java | 14 +-
.../src/java/org/apache/lucene/util/IOUtils.java | 10 +
.../org/apache/lucene/geo/TestTessellator.java | 14 ++
.../lucene/index/TestDemoParallelLeafReader.java | 5 +-
.../org/apache/lucene/index/TestIndexWriter.java | 169 ++++++++-----
.../lucene/index/TestIndexWriterMergePolicy.java | 242 +++++++++++++++++-
.../org/apache/lucene/index/TestMergePolicy.java | 10 +-
.../lucene/search/TestPhraseWildcardQuery.java | 7 +-
.../apache/lucene/index/MockRandomMergePolicy.java | 32 +++
.../org/apache/lucene/util/LuceneTestCase.java | 1 +
.../org/apache/lucene/geo/lucene-9417.geojson.gz | Bin 0 -> 79049 bytes
solr/CHANGES.txt | 10 +-
.../solr/collection1/conf/solrconfig.xml | 11 -
.../org/apache/solr/ltr/feature/SolrFeature.java | 8 +-
.../solr/collection1/conf/solrconfig.xml | 4 -
.../apache/solr/api/CustomContainerPlugins.java | 23 +-
.../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 | 1 +
.../java/org/apache/solr/handler/CatStream.java | 4 +-
.../apache/solr/handler/ReplicationHandler.java | 23 +-
.../java/org/apache/solr/handler/SnapShooter.java | 3 +
.../apache/solr/handler/admin/MergeIndexesOp.java | 8 +-
.../solr/handler/component/SearchHandler.java | 31 +--
.../java/org/apache/solr/pkg/PackageLoader.java | 20 +-
.../java/org/apache/solr/servlet/HttpSolrCall.java | 17 +-
.../solr/util/circuitbreaker/CircuitBreaker.java | 51 ----
.../util/circuitbreaker/CircuitBreakerManager.java | 105 --------
.../util/circuitbreaker/CircuitBreakerType.java | 26 --
.../util/circuitbreaker/MemoryCircuitBreaker.java | 87 -------
.../resources/EditableSolrConfigAttributes.json | 2 -
.../conf/solrconfig-cache-enable-disable.xml | 4 -
.../solr/collection1/conf/solrconfig-elevate.xml | 4 -
.../conf/solrconfig-implicitproperties.xml | 2 -
.../conf/solrconfig-memory-circuitbreaker.xml | 91 -------
.../conf/solrconfig-sortingresponse.xml | 4 -
.../solr/collection1/conf/solrconfig.xml | 10 -
.../solr/collection1/conf/solrconfig_perf.xml | 2 -
.../apache/solr/cloud/BasicDistributedZk2Test.java | 5 +-
.../AbstractCloudBackupRestoreTestCase.java | 7 +
.../test/org/apache/solr/core/SolrCoreTest.java | 2 -
.../org/apache/solr/core/TestConfigOverlay.java | 2 -
.../core/snapshots/TestSolrCloudSnapshots.java | 2 +
.../solr/core/snapshots/TestSolrCoreSnapshots.java | 2 +
.../apache/solr/handler/TestContainerPlugin.java | 56 ++++-
.../org/apache/solr/handler/TestCoreBackup.java | 22 +-
.../solr/handler/TestReplicationHandler.java | 4 +-
.../org/apache/solr/handler/TestRestoreCore.java | 11 +
.../apache/solr/handler/V2ApiIntegrationTest.java | 19 +-
.../admin/CoreMergeIndexesAdminHandlerTest.java | 8 +-
.../solr/handler/component/DebugComponentTest.java | 12 +-
.../org/apache/solr/util/TestCircuitBreaker.java | 190 --------------
.../example-DIH/solr/db/conf/solrconfig.xml | 10 -
.../example-DIH/solr/mail/conf/solrconfig.xml | 10 -
.../example-DIH/solr/solr/conf/solrconfig.xml | 10 -
solr/example/files/conf/solrconfig.xml | 10 -
solr/server/resources/log4j2.xml | 5 +
.../solr/configsets/_default/conf/solrconfig.xml | 10 -
.../conf/solrconfig.xml | 10 -
solr/solr-ref-guide/src/config-api.adoc | 4 -
solr/solr-ref-guide/src/index-replication.adoc | 25 +-
.../src/query-settings-in-solrconfig.adoc | 18 --
.../java/org/apache/solr/client/solrj/io/Lang.java | 100 +++++++-
.../{ParallelStream.java => DrillStream.java} | 203 +++++++--------
.../client/solrj/request/beans/PluginMeta.java | 3 +
.../client/solrj/MergeIndexesExampleTestBase.java | 3 +-
.../org/apache/solr/client/solrj/io/TestLang.java | 2 +-
.../solrj/io/stream/StreamExpressionTest.java | 73 +++++-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 1 +
79 files changed, 1279 insertions(+), 1096 deletions(-)
create mode 100644 lucene/test-framework/src/resources/org/apache/lucene/geo/lucene-9417.geojson.gz
delete mode 100644 solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java
delete mode 100644 solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
delete mode 100644 solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerType.java
delete mode 100644 solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java
delete mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-memory-circuitbreaker.xml
delete mode 100644 solr/core/src/test/org/apache/solr/util/TestCircuitBreaker.java
copy solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/{ParallelStream.java => DrillStream.java} (63%)