You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by iv...@apache.org on 2018/04/04 11:39:05 UTC
[2/2] lucene-solr:branch_7x: Merge branch 'branch_7x' of
https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_7x
Merge branch 'branch_7x' of https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_7x
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/51fff3c7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/51fff3c7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/51fff3c7
Branch: refs/heads/branch_7x
Commit: 51fff3c70957fa2866f845ec4a3d04751c3526c4
Parents: f37d738 7fcaac8
Author: Ignacio Vera <iv...@apache.org>
Authored: Wed Apr 4 13:38:21 2018 +0200
Committer: Ignacio Vera <iv...@apache.org>
Committed: Wed Apr 4 13:38:21 2018 +0200
----------------------------------------------------------------------
lucene/CHANGES.txt | 4 +
.../search/intervals/ConjunctionDISI.java | 134 +++++++
.../intervals/ConjunctionIntervalIterator.java | 72 ++++
.../intervals/ConjunctionIntervalsSource.java | 77 ++++
.../intervals/DifferenceIntervalFunction.java | 326 ++++++++++++++++
.../intervals/DifferenceIntervalsSource.java | 74 ++++
.../search/intervals/DisiPriorityQueue.java | 171 +++++++++
.../lucene/search/intervals/DisiWrapper.java | 44 +++
.../intervals/DisjunctionDISIApproximation.java | 76 ++++
.../intervals/DisjunctionIntervalsSource.java | 228 ++++++++++++
.../lucene/search/intervals/IntervalFilter.java | 87 +++++
.../search/intervals/IntervalFunction.java | 368 +++++++++++++++++++
.../search/intervals/IntervalIterator.java | 77 ++++
.../lucene/search/intervals/IntervalQuery.java | 153 ++++++++
.../lucene/search/intervals/IntervalScorer.java | 99 +++++
.../lucene/search/intervals/Intervals.java | 188 ++++++++++
.../search/intervals/IntervalsSource.java | 61 +++
.../intervals/LowpassIntervalsSource.java | 74 ++++
.../search/intervals/TermIntervalsSource.java | 184 ++++++++++
.../lucene/search/intervals/package-info.java | 66 ++++
.../search/intervals/TestIntervalQuery.java | 169 +++++++++
.../lucene/search/intervals/TestIntervals.java | 197 ++++++++++
lucene/tools/forbiddenApis/solr.txt | 1 +
solr/CHANGES.txt | 28 +-
solr/bin/solr | 10 +-
solr/bin/solr.cmd | 11 +-
solr/bin/solr.in.cmd | 8 +-
solr/bin/solr.in.sh | 8 +-
.../handler/dataimport/DataImportHandler.java | 6 +-
.../contrib/prometheus-exporter/conf/log4j2.xml | 2 +-
.../solr/cloud/autoscaling/AutoScaling.java | 40 +-
.../cloud/autoscaling/AutoScalingHandler.java | 32 +-
.../cloud/autoscaling/ComputePlanAction.java | 13 +-
.../cloud/autoscaling/HttpTriggerListener.java | 12 +-
.../autoscaling/InactiveShardPlanAction.java | 18 +-
.../solr/cloud/autoscaling/MetricTrigger.java | 22 +-
.../cloud/autoscaling/NodeAddedTrigger.java | 25 +-
.../solr/cloud/autoscaling/NodeLostTrigger.java | 22 +-
.../autoscaling/OverseerTriggerThread.java | 12 +-
.../cloud/autoscaling/ScheduledTrigger.java | 37 +-
.../cloud/autoscaling/ScheduledTriggers.java | 8 +-
.../cloud/autoscaling/SearchRateTrigger.java | 28 +-
.../cloud/autoscaling/SystemLogListener.java | 10 +-
.../solr/cloud/autoscaling/TriggerAction.java | 24 +-
.../cloud/autoscaling/TriggerActionBase.java | 50 ++-
.../solr/cloud/autoscaling/TriggerBase.java | 69 +++-
.../solr/cloud/autoscaling/TriggerListener.java | 20 +-
.../cloud/autoscaling/TriggerListenerBase.java | 52 ++-
.../solr/cloud/autoscaling/TriggerUtils.java | 87 +++++
.../autoscaling/TriggerValidationException.java | 74 ++++
.../org/apache/solr/core/CoreContainer.java | 45 ++-
.../apache/solr/core/HdfsDirectoryFactory.java | 8 +-
.../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/CollectionsHandler.java | 37 +-
.../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/logging/log4j2/Log4j2Watcher.java | 12 +-
.../solr/metrics/SolrCoreMetricManager.java | 7 +-
.../apache/solr/metrics/SolrMetricManager.java | 58 ++-
.../apache/solr/metrics/SolrMetricProducer.java | 29 +-
.../metrics/reporters/solr/SolrReporter.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 +-
.../org/apache/solr/util/SolrLogLayout.java | 30 +-
.../apache/solr/util/StartupLoggingUtils.java | 8 +-
.../stats/InstrumentedHttpRequestExecutor.java | 7 +-
...entedPoolingHttpClientConnectionManager.java | 19 +-
.../test/org/apache/solr/CursorPagingTest.java | 5 +-
.../test/org/apache/solr/SolrInfoBeanTest.java | 2 +-
.../org/apache/solr/cloud/ForceLeaderTest.java | 93 ++++-
.../autoscaling/AutoScalingHandlerTest.java | 117 ++++++
.../autoscaling/ComputePlanActionTest.java | 16 +-
.../autoscaling/ExecutePlanActionTest.java | 9 +-
.../autoscaling/HttpTriggerListenerTest.java | 13 +-
.../MetricTriggerIntegrationTest.java | 5 +-
.../cloud/autoscaling/MetricTriggerTest.java | 6 +-
.../NodeAddedTriggerIntegrationTest.java | 5 +-
.../cloud/autoscaling/NodeAddedTriggerTest.java | 52 ++-
.../NodeLostTriggerIntegrationTest.java | 5 +-
.../cloud/autoscaling/NodeLostTriggerTest.java | 50 ++-
.../NodeMarkersRegistrationTest.java | 5 +-
.../autoscaling/RestoreTriggerStateTest.java | 5 +-
.../ScheduledMaintenanceTriggerTest.java | 5 +-
.../cloud/autoscaling/ScheduledTriggerTest.java | 13 +-
.../SearchRateTriggerIntegrationTest.java | 5 +-
.../autoscaling/SearchRateTriggerTest.java | 4 +-
.../TriggerCooldownIntegrationTest.java | 9 +-
.../autoscaling/TriggerIntegrationTest.java | 15 +-
.../TriggerSetPropertiesIntegrationTest.java | 19 +-
.../autoscaling/sim/TestComputePlanAction.java | 18 +-
.../autoscaling/sim/TestExecutePlanAction.java | 2 +-
.../cloud/autoscaling/sim/TestLargeCluster.java | 6 +-
.../autoscaling/sim/TestNodeAddedTrigger.java | 43 ++-
.../autoscaling/sim/TestNodeLostTrigger.java | 39 +-
.../autoscaling/sim/TestTriggerIntegration.java | 19 +-
.../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 +-
.../apache/solr/handler/RequestLoggingTest.java | 2 +-
.../solr/handler/admin/LoggingHandlerTest.java | 3 +-
.../org/apache/solr/metrics/JvmMetricsTest.java | 2 +-
.../solr/metrics/SolrCoreMetricManagerTest.java | 2 +-
.../solr/metrics/SolrMetricManagerTest.java | 10 +-
.../solr/metrics/SolrMetricTestUtils.java | 2 +-
.../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 +-
solr/example/resources/log4j2.xml | 2 +-
solr/server/resources/log4j2.xml | 2 +-
.../solr-ref-guide/src/configuring-logging.adoc | 6 +-
.../src/the-dismax-query-parser.adoc | 2 +-
.../src/the-extended-dismax-query-parser.adoc | 8 +
.../java/org/apache/solr/SolrTestCaseJ4.java | 2 +
.../src/java/org/apache/solr/util/LogLevel.java | 2 +-
.../apache/solr/TestLogLevelAnnotations.java | 2 +-
141 files changed, 4408 insertions(+), 561 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/51fff3c7/lucene/CHANGES.txt
----------------------------------------------------------------------