You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2017/01/12 16:52:00 UTC
[43/43] lucene-solr:jira/solr-8593: Merge branch
'apache-https-master' into jira/solr-8593
Merge branch 'apache-https-master' into jira/solr-8593
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/73719471
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/73719471
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/73719471
Branch: refs/heads/jira/solr-8593
Commit: 737194712f1f5b4fa54efc7e84cc17c3b3b212b3
Parents: 4b17b82 6c6c077
Author: Kevin Risden <kr...@apache.org>
Authored: Thu Jan 12 11:51:04 2017 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Thu Jan 12 11:51:04 2017 -0500
----------------------------------------------------------------------
dev-tools/idea/lucene/suggest/suggest.iml | 1 -
lucene/CHANGES.txt | 31 +-
.../lucene/analysis/TokenStreamToAutomaton.java | 11 +-
.../lucene/search/DoubleValuesSource.java | 27 +
.../apache/lucene/search/LongValuesSource.java | 27 +
.../apache/lucene/search/TermInSetQuery.java | 369 ++++++++++++
.../search/UsageTrackingQueryCachingPolicy.java | 5 +-
.../org/apache/lucene/store/MMapDirectory.java | 2 +-
.../lucene/analysis/TestGraphTokenizers.java | 600 +++++++++++++++++++
.../lucene/search/TermInSetQueryTest.java | 328 ++++++++++
.../demo/facet/DistanceFacetsExample.java | 18 +-
.../ExpressionAggregationFacetsExample.java | 2 +-
lucene/expressions/build.xml | 11 -
.../org/apache/lucene/expressions/Bindings.java | 14 +-
.../apache/lucene/expressions/Expression.java | 21 +-
.../expressions/ExpressionComparator.java | 100 ----
.../expressions/ExpressionFunctionValues.java | 35 +-
.../lucene/expressions/ExpressionRescorer.java | 33 +-
.../lucene/expressions/ExpressionSortField.java | 77 ---
.../expressions/ExpressionValueSource.java | 70 +--
.../lucene/expressions/ScoreFunctionValues.java | 46 --
.../lucene/expressions/ScoreValueSource.java | 61 --
.../lucene/expressions/SimpleBindings.java | 30 +-
.../expressions/js/JavascriptCompiler.java | 15 +-
.../apache/lucene/expressions/package-info.java | 5 +-
.../lucene/expressions/TestDemoExpressions.java | 44 +-
.../expressions/TestExpressionSortField.java | 2 +-
.../expressions/TestExpressionValueSource.java | 111 +---
.../expressions/js/TestCustomFunctions.java | 20 +-
.../expressions/js/TestJavascriptFunction.java | 2 +-
.../js/TestJavascriptOperations.java | 2 +-
.../org/apache/lucene/facet/DrillSideways.java | 37 +-
.../apache/lucene/facet/MultiFacetQuery.java | 12 +-
.../org/apache/lucene/facet/package-info.java | 2 +-
.../apache/lucene/facet/range/DoubleRange.java | 28 +-
.../facet/range/DoubleRangeFacetCounts.java | 63 +-
.../apache/lucene/facet/range/LongRange.java | 28 +-
.../facet/range/LongRangeFacetCounts.java | 26 +-
.../org/apache/lucene/facet/range/Range.java | 31 -
.../lucene/facet/taxonomy/FakeScorer.java | 53 --
.../taxonomy/TaxonomyFacetSumValueSource.java | 114 ++--
.../facet/range/TestRangeFacetCounts.java | 61 +-
.../TestTaxonomyFacetSumValueSource.java | 54 +-
.../AbstractAllGroupHeadsCollector.java | 176 ------
.../grouping/AbstractAllGroupsCollector.java | 67 ---
.../AbstractDistinctValuesCollector.java | 59 --
.../AbstractFirstPassGroupingCollector.java | 354 -----------
.../grouping/AbstractGroupFacetCollector.java | 319 ----------
.../AbstractSecondPassGroupingCollector.java | 162 -----
.../search/grouping/AllGroupHeadsCollector.java | 176 ++++++
.../search/grouping/AllGroupsCollector.java | 67 +++
.../search/grouping/CollectedSearchGroup.java | 2 +-
.../grouping/DistinctValuesCollector.java | 59 ++
.../grouping/FirstPassGroupingCollector.java | 363 +++++++++++
.../lucene/search/grouping/GroupDocs.java | 8 +-
.../search/grouping/GroupFacetCollector.java | 324 ++++++++++
.../apache/lucene/search/grouping/Grouper.java | 56 ++
.../lucene/search/grouping/GroupingSearch.java | 130 +---
.../lucene/search/grouping/SearchGroup.java | 23 +-
.../grouping/SecondPassGroupingCollector.java | 169 ++++++
.../lucene/search/grouping/TopGroups.java | 12 +-
.../FunctionAllGroupHeadsCollector.java | 32 +-
.../function/FunctionAllGroupsCollector.java | 4 +-
.../FunctionDistinctValuesCollector.java | 35 +-
.../FunctionFirstPassGroupingCollector.java | 6 +-
.../grouping/function/FunctionGrouper.java | 69 +++
.../FunctionSecondPassGroupingCollector.java | 6 +-
.../term/TermAllGroupHeadsCollector.java | 26 +-
.../grouping/term/TermAllGroupsCollector.java | 8 +-
.../term/TermDistinctValuesCollector.java | 26 +-
.../term/TermFirstPassGroupingCollector.java | 6 +-
.../grouping/term/TermGroupFacetCollector.java | 10 +-
.../search/grouping/term/TermGrouper.java | 81 +++
.../term/TermSecondPassGroupingCollector.java | 6 +-
.../grouping/AllGroupHeadsCollectorTest.java | 14 +-
.../search/grouping/AllGroupsCollectorTest.java | 6 +-
.../grouping/DistinctValuesCollectorTest.java | 46 +-
.../grouping/GroupFacetCollectorTest.java | 10 +-
.../lucene/search/grouping/TestGrouping.java | 70 +--
.../search/uhighlight/FieldHighlighter.java | 4 +-
.../uhighlight/LengthGoalBreakIterator.java | 185 ++++++
.../lucene/search/uhighlight/OffsetsEnum.java | 45 +-
.../lucene/search/uhighlight/Passage.java | 1 +
.../uhighlight/LengthGoalBreakIteratorTest.java | 104 ++++
.../TestUnifiedHighlighterExtensibility.java | 57 +-
.../org/apache/lucene/queries/TermsQuery.java | 381 ------------
.../lucene/queries/function/ValueSource.java | 111 ++++
.../apache/lucene/queries/TermsQueryTest.java | 339 -----------
.../complexPhrase/ComplexPhraseQueryParser.java | 4 +-
.../complexPhrase/TestComplexPhraseQuery.java | 6 +
.../prefix/TermQueryPrefixTreeStrategy.java | 10 +-
.../spatial/prefix/NumberRangeFacetsTest.java | 6 +-
lucene/suggest/build.xml | 4 +-
.../suggest/DocumentValueSourceDictionary.java | 58 +-
.../DocumentValueSourceDictionaryTest.java | 287 ++++++++-
.../lucene/analysis/TestGraphTokenizers.java | 588 ------------------
solr/CHANGES.txt | 43 +-
.../org/apache/solr/core/CoreContainer.java | 10 +-
.../org/apache/solr/core/DirectoryFactory.java | 3 +-
.../org/apache/solr/core/JmxMonitoredMap.java | 63 +-
.../solr/core/MetricsDirectoryFactory.java | 60 +-
.../src/java/org/apache/solr/core/SolrCore.java | 4 +-
.../org/apache/solr/core/SolrInfoMBean.java | 5 +-
.../org/apache/solr/core/SolrXmlConfig.java | 9 +-
.../solr/core/StandardDirectoryFactory.java | 3 +-
.../apache/solr/handler/CdcrRequestHandler.java | 5 +
.../org/apache/solr/handler/GraphHandler.java | 1 +
.../apache/solr/handler/PingRequestHandler.java | 5 +
.../apache/solr/handler/ReplicationHandler.java | 5 +
.../apache/solr/handler/RequestHandlerBase.java | 2 +-
.../org/apache/solr/handler/SchemaHandler.java | 5 +
.../org/apache/solr/handler/SnapShooter.java | 6 +-
.../apache/solr/handler/SolrConfigHandler.java | 2 +-
.../org/apache/solr/handler/StreamHandler.java | 1 +
.../solr/handler/UpdateRequestHandler.java | 5 +
.../solr/handler/admin/CollectionsHandler.java | 5 +
.../solr/handler/admin/ConfigSetsHandler.java | 5 +
.../solr/handler/admin/CoreAdminHandler.java | 5 +
.../apache/solr/handler/admin/InfoHandler.java | 5 +
.../solr/handler/admin/LoggingHandler.java | 6 +
.../solr/handler/admin/LukeRequestHandler.java | 5 +
.../solr/handler/admin/MetricsHandler.java | 5 +
.../solr/handler/admin/PluginInfoHandler.java | 5 +
.../handler/admin/PropertiesRequestHandler.java | 5 +
.../solr/handler/admin/SecurityConfHandler.java | 5 +
.../admin/SegmentsInfoRequestHandler.java | 5 +
.../handler/admin/ShowFileRequestHandler.java | 4 +
.../handler/admin/SolrInfoMBeanHandler.java | 5 +
.../solr/handler/admin/SystemInfoHandler.java | 7 +-
.../solr/handler/admin/ThreadDumpHandler.java | 5 +
.../handler/admin/ZookeeperInfoHandler.java | 5 +
.../solr/handler/component/DebugComponent.java | 5 +
.../solr/handler/component/ExpandComponent.java | 30 +-
.../solr/handler/component/FacetComponent.java | 5 +
.../handler/component/HighlightComponent.java | 5 +
.../component/HttpShardHandlerFactory.java | 17 +-
.../component/MoreLikeThisComponent.java | 7 +-
.../solr/handler/component/QueryComponent.java | 5 +
.../handler/component/RealTimeGetComponent.java | 5 +
.../handler/component/SpellCheckComponent.java | 5 +
.../handler/component/TermVectorComponent.java | 5 +
.../solr/handler/component/TermsComponent.java | 5 +
.../solr/highlight/HighlightingPluginBase.java | 2 +-
.../solr/highlight/UnifiedSolrHighlighter.java | 12 +-
.../solr/metrics/SolrCoreMetricManager.java | 3 +-
.../metrics/reporters/JmxObjectNameFactory.java | 155 +++++
.../solr/metrics/reporters/SolrJmxReporter.java | 105 ----
.../org/apache/solr/request/SimpleFacets.java | 4 +-
.../java/org/apache/solr/schema/FieldType.java | 4 +-
.../org/apache/solr/search/CacheConfig.java | 2 +-
.../org/apache/solr/search/FastLRUCache.java | 2 +-
.../java/org/apache/solr/search/Grouping.java | 14 +-
.../apache/solr/search/TermsQParserPlugin.java | 4 +-
.../apache/solr/search/facet/FacetModule.java | 5 +
.../solr/search/grouping/CommandHandler.java | 4 +-
.../command/SearchGroupsFieldCommand.java | 8 +-
.../command/TopGroupsFieldCommand.java | 4 +-
.../org/apache/solr/search/join/GraphQuery.java | 4 +-
.../apache/solr/search/mlt/CloudMLTQParser.java | 49 +-
.../solr/search/mlt/SimpleMLTQParser.java | 30 +-
.../solr/security/PKIAuthenticationPlugin.java | 6 +
.../DocumentExpressionDictionaryFactory.java | 6 +-
.../solr/update/DirectUpdateHandler2.java | 5 -
.../java/org/apache/solr/update/PeerSync.java | 42 +-
.../org/apache/solr/update/UpdateHandler.java | 5 +
.../java/org/apache/solr/update/UpdateLog.java | 74 ++-
.../apache/solr/update/UpdateShardHandler.java | 16 +-
.../solr/update/UpdateShardHandlerConfig.java | 14 +-
.../AddSchemaFieldsUpdateProcessorFactory.java | 3 +-
.../SkipExistingDocumentsProcessorFactory.java | 255 ++++++++
.../src/java/org/apache/solr/util/DOMUtil.java | 5 +
.../stats/HttpClientMetricNameStrategy.java | 28 +
.../stats/InstrumentedHttpRequestExecutor.java | 81 ++-
.../resources/EditableSolrConfigAttributes.json | 16 +-
...dd-schema-fields-update-processor-chains.xml | 8 +-
.../conf/solrconfig-cache-enable-disable.xml | 80 +++
.../collection1/conf/solrconfig-schemaless.xml | 45 +-
.../test-files/solr/solr-gangliareporter.xml | 2 +-
.../test-files/solr/solr-graphitereporter.xml | 2 +-
.../src/test-files/solr/solr-slf4jreporter.xml | 4 +-
.../solr/cloud/BasicDistributedZkTest.java | 2 +-
.../solr/cloud/PeerSyncReplicationTest.java | 15 +
.../apache/solr/cloud/TestCloudRecovery.java | 26 +
.../test/org/apache/solr/core/TestConfig.java | 32 +
.../solr/handler/admin/MBeansHandlerTest.java | 4 +-
.../solr/handler/admin/MetricsHandlerTest.java | 18 +-
.../highlight/TestUnifiedSolrHighlighter.java | 24 +-
.../metrics/SolrMetricsIntegrationTest.java | 2 +-
.../reporters/SolrGangliaReporterTest.java | 2 +-
.../reporters/SolrGraphiteReporterTest.java | 2 +-
.../schema/TestSchemalessBufferedUpdates.java | 160 +++++
.../ApacheLuceneSolrNearQueryBuilder.java | 51 ++
.../org/apache/solr/search/TestRTGBase.java | 12 -
.../org/apache/solr/search/TestRecovery.java | 179 +++++-
.../apache/solr/search/TestRecoveryHdfs.java | 11 -
.../apache/solr/search/TestSolrCoreParser.java | 110 ++++
.../apache/solr/search/TestSolrQueryParser.java | 12 +-
.../solr/search/mlt/CloudMLTQParserTest.java | 23 +-
.../solr/search/mlt/SimpleMLTQParserTest.java | 33 +-
.../apache/solr/update/CdcrUpdateLogTest.java | 17 -
.../solr/update/SolrIndexMetricsTest.java | 4 +-
...ipExistingDocumentsProcessorFactoryTest.java | 335 +++++++++++
solr/example/files/conf/solrconfig.xml | 5 +-
.../basic_configs/conf/solrconfig.xml | 6 +-
.../conf/solrconfig.xml | 5 +-
.../solr/common/params/HighlightParams.java | 2 +-
.../client/solrj/impl/CloudSolrClientTest.java | 6 +-
.../solrj/io/graph/GraphExpressionTest.java | 3 +-
.../java/org/apache/solr/SolrTestCaseJ4.java | 22 +-
.../java/org/apache/solr/util/TestHarness.java | 3 +-
solr/webapp/web/js/angular/services.js | 46 +-
211 files changed, 6402 insertions(+), 4097 deletions(-)
----------------------------------------------------------------------