You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2018/04/02 07:37:49 UTC
[02/34] lucene-solr:jira/solr-12095: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/lucene-solr
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/358e5959
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/358e5959
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/358e5959
Branch: refs/heads/jira/solr-12095
Commit: 358e59596d17ba34452ea923e048afee6233d597
Parents: 5b429df 668b817
Author: Karl Wright <Da...@gmail.com>
Authored: Thu Mar 29 10:37:45 2018 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Thu Mar 29 10:37:45 2018 -0400
----------------------------------------------------------------------
dev-tools/scripts/crawl.maven.release.dist.sh | 4 +-
dev-tools/scripts/prep-solr-ref-guide-rc.sh | 20 +++----
dev-tools/scripts/smokeTestRelease.py | 44 +++++++--------
lucene/CHANGES.txt | 9 +++
lucene/common-build.xml | 10 ++--
.../lucene/index/IndexDeletionPolicy.java | 18 +++---
.../apache/lucene/index/NoDeletionPolicy.java | 6 --
solr/CHANGES.txt | 14 ++++-
solr/build.xml | 2 +-
.../handler/dataimport/DataImportHandler.java | 6 +-
.../cloud/LeaderInitiatedRecoveryThread.java | 6 +-
.../org/apache/solr/core/CoreContainer.java | 45 ++++++++-------
.../apache/solr/core/HdfsDirectoryFactory.java | 8 +--
.../solr/core/IndexDeletionPolicyWrapper.java | 6 --
.../src/java/org/apache/solr/core/SolrCore.java | 41 ++++++++------
.../java/org/apache/solr/core/SolrInfoBean.java | 2 +-
.../apache/solr/handler/ReplicationHandler.java | 44 +++++++--------
.../apache/solr/handler/RequestHandlerBase.java | 12 ++--
.../solr/handler/admin/CoreAdminHandler.java | 4 +-
.../component/HttpShardHandlerFactory.java | 9 ++-
.../solr/handler/component/SearchComponent.java | 2 +-
.../handler/component/SuggestComponent.java | 11 +++-
.../solr/highlight/HighlightingPluginBase.java | 6 +-
.../solr/metrics/SolrCoreMetricManager.java | 7 ++-
.../apache/solr/metrics/SolrMetricManager.java | 58 ++++++++++++++++++--
.../apache/solr/metrics/SolrMetricProducer.java | 7 ++-
.../metrics/reporters/solr/SolrReporter.java | 2 +-
.../solr/search/ExtendedDismaxQParser.java | 2 +-
.../org/apache/solr/search/FastLRUCache.java | 9 ++-
.../java/org/apache/solr/search/LFUCache.java | 8 ++-
.../java/org/apache/solr/search/LRUCache.java | 10 +++-
.../apache/solr/search/SolrFieldCacheBean.java | 4 +-
.../apache/solr/search/SolrIndexSearcher.java | 37 +++++++------
.../apache/solr/servlet/SolrDispatchFilter.java | 26 ++++++---
.../apache/solr/store/blockcache/Metrics.java | 8 ++-
.../solr/store/hdfs/HdfsLocalityReporter.java | 8 ++-
.../solr/update/DirectUpdateHandler2.java | 28 ++++++----
.../java/org/apache/solr/update/PeerSync.java | 2 +-
.../org/apache/solr/update/SolrIndexWriter.java | 34 +++++++-----
.../java/org/apache/solr/update/UpdateLog.java | 14 +++--
.../apache/solr/update/UpdateShardHandler.java | 6 +-
.../processor/AtomicUpdateProcessorFactory.java | 26 ++++++---
.../stats/InstrumentedHttpRequestExecutor.java | 7 ++-
...entedPoolingHttpClientConnectionManager.java | 19 +++++--
.../solr/collection1/conf/schema12.xml | 12 ++++
.../test/org/apache/solr/CursorPagingTest.java | 5 +-
.../test/org/apache/solr/SolrInfoBeanTest.java | 2 +-
.../org/apache/solr/cloud/ZkSolrClientTest.java | 30 ++++++++--
.../sim/SimClusterStateProvider.java | 6 +-
.../solr/core/ExitableDirectoryReaderTest.java | 7 ++-
.../solr/core/HdfsDirectoryFactoryTest.java | 4 +-
.../test/org/apache/solr/core/MockInfoBean.java | 8 ++-
.../core/MockQuerySenderListenerReqHandler.java | 6 +-
.../apache/solr/core/TestJmxIntegration.java | 4 +-
.../org/apache/solr/metrics/JvmMetricsTest.java | 2 +-
.../solr/metrics/SolrCoreMetricManagerTest.java | 2 +-
.../solr/metrics/SolrMetricManagerTest.java | 10 ++--
.../solr/metrics/SolrMetricTestUtils.java | 2 +-
.../solr/search/TestExtendedDismaxParser.java | 19 ++++++-
.../apache/solr/search/TestFastLRUCache.java | 14 ++---
.../org/apache/solr/search/TestLFUCache.java | 6 +-
.../org/apache/solr/search/TestLRUCache.java | 4 +-
.../solr/search/TestReRankQParserPlugin.java | 3 +-
.../apache/solr/search/TestSolr4Spatial2.java | 3 +-
.../solr/search/TestSolrFieldCacheBean.java | 8 +--
.../apache/solr/search/TestSolrQueryParser.java | 9 +--
.../apache/solr/search/join/BJQParserTest.java | 9 +--
.../solr/search/join/TestScoreJoinQPScore.java | 3 +-
.../solr/store/blockcache/BufferStoreTest.java | 4 +-
.../AtomicUpdateProcessorFactoryTest.java | 1 -
solr/solr-ref-guide/src/meta-docs/publish.adoc | 8 ++-
71 files changed, 524 insertions(+), 318 deletions(-)
----------------------------------------------------------------------