You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/03/13 15:40:45 UTC
[50/50] [abbrv] lucene-solr:jira/solr-9045: Merge branch 'master'
into jira/solr-9045
Merge branch 'master' into jira/solr-9045
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/386a5596
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/386a5596
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/386a5596
Branch: refs/heads/jira/solr-9045
Commit: 386a5596a6f5d69cd2df85d4c9ff62ea4385d378
Parents: df85045 ceffbf9
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Mar 13 15:25:30 2017 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Mar 13 15:25:30 2017 +0000
----------------------------------------------------------------------
build.xml | 10 +-
dev-tools/doap/lucene.rdf | 7 +
dev-tools/doap/solr.rdf | 7 +
dev-tools/maven/solr/pom.xml.template | 9 -
dev-tools/scripts/buildAndPushRelease.py | 2 +-
dev-tools/scripts/smokeTestRelease.py | 4 +
lucene/CHANGES.txt | 43 ++
lucene/MIGRATE.txt | 6 +
.../index/TestBackwardsCompatibility.java | 4 +-
.../org/apache/lucene/index/index.6.4.2-cfs.zip | Bin 0 -> 15856 bytes
.../apache/lucene/index/index.6.4.2-nocfs.zip | Bin 0 -> 15886 bytes
.../apache/lucene/legacy/TestLegacyField.java | 10 -
lucene/build.xml | 6 +-
lucene/common-build.xml | 65 ++-
.../lucene/codecs/StoredFieldsWriter.java | 5 -
.../org/apache/lucene/document/DoubleRange.java | 271 +++++++++
.../java/org/apache/lucene/document/Field.java | 32 --
.../org/apache/lucene/document/FieldType.java | 6 +-
.../org/apache/lucene/document/FloatRange.java | 271 +++++++++
.../org/apache/lucene/document/IntRange.java | 271 +++++++++
.../org/apache/lucene/document/LongRange.java | 269 +++++++++
.../apache/lucene/document/RangeFieldQuery.java | 340 +++++++++++
.../lucene/index/ConcurrentMergeScheduler.java | 75 ++-
.../lucene/index/DefaultIndexingChain.java | 8 -
.../apache/lucene/index/FieldInvertState.java | 20 +-
.../org/apache/lucene/index/IndexWriter.java | 94 ++--
.../org/apache/lucene/index/IndexableField.java | 24 -
.../org/apache/lucene/index/MergePolicy.java | 184 +++++-
.../apache/lucene/index/MergeRateLimiter.java | 177 +++---
.../org/apache/lucene/index/MergeScheduler.java | 12 +
.../apache/lucene/index/NoMergeScheduler.java | 7 +
.../org/apache/lucene/index/PointValues.java | 2 +-
.../index/SortingStoredFieldsConsumer.java | 5 -
.../org/apache/lucene/search/BooleanQuery.java | 1 -
.../org/apache/lucene/search/package-info.java | 25 +-
.../search/similarities/BM25Similarity.java | 12 +-
.../search/similarities/ClassicSimilarity.java | 5 +-
.../search/similarities/SimilarityBase.java | 8 +-
.../search/similarities/TFIDFSimilarity.java | 46 +-
.../lucene/search/spans/NearSpansUnordered.java | 211 ++-----
.../org/apache/lucene/document/TestField.java | 30 -
.../apache/lucene/index/TestCustomNorms.java | 14 +-
.../org/apache/lucene/index/TestFieldReuse.java | 5 -
.../apache/lucene/index/TestIndexSorting.java | 8 +-
.../lucene/index/TestIndexWriterExceptions.java | 66 ---
.../apache/lucene/index/TestIndexableField.java | 10 -
.../lucene/index/TestMergeRateLimiter.java | 4 +-
.../test/org/apache/lucene/index/TestNorms.java | 13 +-
.../org/apache/lucene/index/TestOmitTf.java | 2 +-
.../apache/lucene/index/TestReaderClosed.java | 8 +-
.../lucene/search/TestDisjunctionMaxQuery.java | 2 +-
.../org/apache/lucene/search/TestDocBoost.java | 98 ----
.../search/TestDoubleRangeFieldQueries.java | 251 +++++++++
.../search/TestFloatRangeFieldQueries.java | 251 +++++++++
.../lucene/search/TestIntRangeFieldQueries.java | 251 +++++++++
.../search/TestLongRangeFieldQueries.java | 251 +++++++++
.../lucene/search/TestMatchAllDocsQuery.java | 9 +-
.../apache/lucene/search/TestSimilarity.java | 2 +-
.../similarities/TestBooleanSimilarity.java | 3 +-
.../search/similarities/TestSimilarityBase.java | 1 -
.../apache/lucene/expressions/Expression.java | 24 +-
.../MultiTermHighlighting.java | 20 +-
.../uhighlight/MultiTermHighlighting.java | 20 +-
.../uhighlight/TestUnifiedHighlighterMTQ.java | 30 +-
.../apache/lucene/index/memory/MemoryIndex.java | 72 +--
.../lucene/index/memory/TestMemoryIndex.java | 8 +-
.../memory/TestMemoryIndexAgainstRAMDir.java | 5 +-
.../lucene/document/InetAddressPoint.java | 313 +++++++++++
.../lucene/document/InetAddressRange.java | 168 ++++++
.../apache/lucene/document/LazyDocument.java | 5 -
.../apache/lucene/misc/SweetSpotSimilarity.java | 2 +-
.../lucene/document/TestInetAddressPoint.java | 176 ++++++
.../lucene/misc/SweetSpotSimilarityTest.java | 8 -
.../search/TestInetAddressRangeQueries.java | 215 +++++++
.../apache/lucene/queries/BoostingQuery.java | 2 +-
.../function/TestLongNormValueSource.java | 3 +-
.../queries/payloads/TestPayloadScoreQuery.java | 2 +-
.../queries/payloads/TestPayloadTermQuery.java | 2 +-
.../complexPhrase/ComplexPhraseQueryParser.java | 21 +-
.../queryparser/simple/SimpleQueryParser.java | 8 +-
.../complexPhrase/TestComplexPhraseQuery.java | 36 +-
.../simple/TestSimpleQueryParser.java | 2 +-
.../lucene/document/DoubleRangeField.java | 282 ----------
.../apache/lucene/document/FloatRangeField.java | 282 ----------
.../lucene/document/InetAddressPoint.java | 313 -----------
.../apache/lucene/document/IntRangeField.java | 282 ----------
.../apache/lucene/document/LongRangeField.java | 280 ---------
.../apache/lucene/document/RangeFieldQuery.java | 340 -----------
.../org/apache/lucene/document/package.html | 3 +-
.../lucene/document/TestDoubleRangeField.java | 10 +-
.../lucene/document/TestInetAddressPoint.java | 176 ------
.../search/BaseRangeFieldQueryTestCase.java | 344 ------------
.../search/TestDoubleRangeFieldQueries.java | 251 ---------
.../search/TestFloatRangeFieldQueries.java | 251 ---------
.../lucene/search/TestIntRangeFieldQueries.java | 251 ---------
.../search/TestLongRangeFieldQueries.java | 251 ---------
.../lucene/index/OwnCacheKeyMultiReader.java | 76 +++
.../lucene/search/BaseExplanationTestCase.java | 1 -
.../search/BaseRangeFieldQueryTestCase.java | 346 ++++++++++++
solr/CHANGES.txt | 79 ++-
solr/bin/install_solr_service.sh | 2 +-
solr/build.xml | 9 +-
solr/common-build.xml | 9 +-
.../apache/solr/schema/ICUCollationField.java | 6 +-
.../solr/handler/dataimport/DocBuilder.java | 24 +-
.../handler/dataimport/config/EntityField.java | 6 -
.../handler/dataimport/TestJdbcDataSource.java | 80 ++-
.../handler/extraction/ExtractingParams.java | 13 -
.../handler/extraction/SolrContentHandler.java | 17 +-
.../ExtractingRequestHandlerTest.java | 4 +-
.../LanguageIdentifierUpdateProcessor.java | 2 +-
.../test/org/apache/solr/hadoop/MRUnitBase.java | 2 -
.../MapReduceIndexerToolArgumentParserTest.java | 1 -
.../solr/hadoop/MorphlineBasicMiniMRTest.java | 1 -
.../morphlines/cell/SolrCellMorphlineTest.java | 2 -
.../solr/morphlines/solr/LoadSolrBuilder.java | 32 +-
.../test-morphlines/loadSolrBasic.conf | 7 +-
.../test-morphlines/solrCellDocumentTypes.conf | 23 +-
.../test-morphlines/solrCellJPGCompressed.conf | 17 +-
.../test-files/test-morphlines/solrCellXML.conf | 11 +-
.../test-morphlines/tokenizeText.conf | 6 +-
.../tutorialReadAvroContainer.conf | 11 +-
.../solr/AbstractSolrMorphlineTestBase.java | 2 -
.../solr/AbstractSolrMorphlineZkTestBase.java | 4 -
.../solr/uima/processor/UIMAToSolrMapper.java | 2 +-
.../java/org/apache/solr/api/V2HttpCall.java | 2 +-
.../solrj/embedded/EmbeddedSolrServer.java | 55 +-
.../org/apache/solr/cloud/ElectionContext.java | 5 +-
.../java/org/apache/solr/cloud/Overseer.java | 7 +-
.../solr/cloud/OverseerNodePrioritizer.java | 2 +-
.../solr/cloud/OverseerTaskProcessor.java | 6 +-
.../org/apache/solr/cloud/ZkController.java | 2 +-
.../org/apache/solr/core/CoreContainer.java | 30 +-
.../org/apache/solr/core/JmxMonitoredMap.java | 9 +-
.../java/org/apache/solr/core/PluginBag.java | 2 +-
.../src/java/org/apache/solr/core/SolrCore.java | 7 +-
.../org/apache/solr/core/SolrInfoMBean.java | 4 +-
.../org/apache/solr/core/SolrXmlConfig.java | 3 +-
.../handler/DocumentAnalysisRequestHandler.java | 4 +-
.../org/apache/solr/handler/ExportWriter.java | 2 +-
.../apache/solr/handler/RequestHandlerBase.java | 7 +-
.../org/apache/solr/handler/StreamHandler.java | 30 +-
.../solr/handler/admin/LukeRequestHandler.java | 1 -
.../handler/admin/MetricsCollectorHandler.java | 228 ++++++++
.../solr/handler/admin/MetricsHandler.java | 2 +-
.../handler/component/RangeFacetRequest.java | 5 +-
.../component/SortedDateStatsValues.java | 89 +++
.../handler/component/StatsValuesFactory.java | 8 +-
.../solr/handler/loader/CSVLoaderBase.java | 4 +-
.../apache/solr/handler/loader/JsonLoader.java | 29 +-
.../apache/solr/handler/loader/XMLLoader.java | 23 +-
.../org/apache/solr/handler/sql/SolrRules.java | 14 +
.../apache/solr/handler/sql/SolrTableScan.java | 4 +
.../solr/highlight/PostingsSolrHighlighter.java | 35 +-
.../solr/highlight/UnifiedSolrHighlighter.java | 28 +-
.../apache/solr/metrics/AggregateMetric.java | 200 +++++++
.../solr/metrics/SolrCoreMetricManager.java | 125 ++++-
.../apache/solr/metrics/SolrMetricManager.java | 325 ++++++++++-
.../metrics/reporters/JmxObjectNameFactory.java | 6 +-
.../reporters/solr/SolrClusterReporter.java | 277 +++++++++
.../metrics/reporters/solr/SolrReporter.java | 392 +++++++++++++
.../reporters/solr/SolrShardReporter.java | 188 +++++++
.../metrics/reporters/solr/package-info.java | 22 +
.../org/apache/solr/request/NumericFacets.java | 4 +-
.../org/apache/solr/request/SimpleFacets.java | 10 +-
.../solr/request/SolrQueryRequestBase.java | 17 +-
.../org/apache/solr/response/DocsStreamer.java | 2 +
.../solr/schema/AbstractSpatialFieldType.java | 8 +-
.../java/org/apache/solr/schema/BBoxField.java | 2 +-
.../org/apache/solr/schema/BinaryField.java | 7 +-
.../java/org/apache/solr/schema/BoolField.java | 4 +-
.../org/apache/solr/schema/CollationField.java | 6 +-
.../org/apache/solr/schema/CurrencyField.java | 8 +-
.../org/apache/solr/schema/DatePointField.java | 218 +++++++
.../org/apache/solr/schema/DateRangeField.java | 4 +-
.../apache/solr/schema/DoublePointField.java | 5 +-
.../java/org/apache/solr/schema/EnumField.java | 14 +-
.../java/org/apache/solr/schema/FieldType.java | 26 +-
.../org/apache/solr/schema/FloatPointField.java | 5 +-
.../org/apache/solr/schema/IntPointField.java | 5 +-
.../solr/schema/LatLonPointSpatialField.java | 272 +++++++++
.../java/org/apache/solr/schema/LatLonType.java | 10 +-
.../org/apache/solr/schema/LongPointField.java | 5 +-
.../java/org/apache/solr/schema/PointField.java | 6 +-
.../java/org/apache/solr/schema/PointType.java | 8 +-
.../apache/solr/schema/PreAnalyzedField.java | 10 +-
.../org/apache/solr/schema/SchemaField.java | 10 +-
.../java/org/apache/solr/schema/StrField.java | 4 +-
.../java/org/apache/solr/schema/TrieField.java | 9 +-
.../java/org/apache/solr/search/Grouping.java | 2 +-
.../apache/solr/search/SolrIndexSearcher.java | 5 +-
.../GroupedEndResultTransformer.java | 2 +-
.../solr/security/PKIAuthenticationPlugin.java | 2 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 2 +-
.../apache/solr/servlet/SolrRequestParsers.java | 11 +-
.../solr/store/blockcache/BlockCache.java | 15 +-
.../store/blockcache/BlockDirectoryCache.java | 5 -
.../apache/solr/store/blockcache/Metrics.java | 121 ++--
.../solr/update/DirectUpdateHandler2.java | 128 +++--
.../org/apache/solr/update/DocumentBuilder.java | 41 +-
.../java/org/apache/solr/update/PeerSync.java | 8 +-
...aluesOrNoneFieldMutatingUpdateProcessor.java | 3 +-
.../processor/AtomicUpdateDocumentMerger.java | 17 +-
.../CloneFieldUpdateProcessorFactory.java | 3 +-
.../ConcatFieldUpdateProcessorFactory.java | 3 +-
.../CountFieldValuesUpdateProcessorFactory.java | 3 +-
.../FieldValueMutatingUpdateProcessor.java | 3 +-
.../FieldValueSubsetUpdateProcessorFactory.java | 3 +-
.../PreAnalyzedUpdateProcessorFactory.java | 9 +-
.../org/apache/solr/util/stats/MetricUtils.java | 267 ++++++---
.../conf/schema-docValuesFaceting.xml | 5 +-
.../solr/collection1/conf/schema-point.xml | 11 +
.../solr/collection1/conf/schema-sorts.xml | 11 +-
.../solr/collection1/conf/schema-spatial.xml | 4 +
.../test-files/solr/collection1/conf/schema.xml | 11 +-
.../solr/collection1/conf/schema11.xml | 3 +-
.../solr/collection1/conf/schema12.xml | 9 +-
.../solr/collection1/conf/schema_latest.xml | 13 +-
.../conf/solrconfig-managed-schema.xml | 2 +-
...lrconfig-parsing-update-processor-chains.xml | 7 +
.../conf/solrconfig-update-processor-chains.xml | 2 +
.../src/test-files/solr/solr-solrreporter.xml | 66 +++
.../org/apache/solr/BasicFunctionalityTest.java | 12 +-
.../org/apache/solr/TestDocumentBuilder.java | 1 -
.../TestEmbeddedSolrServerSchemaAPI.java | 111 ++++
.../solr/cloud/TestCloudDeleteByQuery.java | 2 +-
.../apache/solr/cloud/TestCloudRecovery.java | 6 +-
.../TestStressCloudBlindAtomicUpdates.java | 6 +-
.../cloud/TestTolerantUpdateProcessorCloud.java | 2 +-
.../org/apache/solr/cloud/rule/RulesTest.java | 2 +-
.../org/apache/solr/core/TestCoreDiscovery.java | 4 +-
.../apache/solr/core/TestDynamicLoading.java | 2 +-
.../apache/solr/core/TestJmxMonitoredMap.java | 2 +-
.../apache/solr/core/TestSolrConfigHandler.java | 14 +-
.../org/apache/solr/handler/JsonLoaderTest.java | 5 +-
.../apache/solr/handler/TestReqParamsAPI.java | 3 +
.../org/apache/solr/handler/TestSQLHandler.java | 12 +
.../solr/handler/V2ApiIntegrationTest.java | 4 +-
.../handler/XmlUpdateRequestHandlerTest.java | 7 -
.../handler/admin/LukeRequestHandlerTest.java | 4 +-
.../highlight/TestPostingsSolrHighlighter.java | 13 +
.../highlight/TestUnifiedSolrHighlighter.java | 13 +
.../index/TestSlowCompositeReaderWrapper.java | 3 +-
.../solr/metrics/SolrCoreMetricManagerTest.java | 31 +-
.../solr/metrics/SolrMetricManagerTest.java | 34 +-
.../metrics/SolrMetricsIntegrationTest.java | 15 +-
.../metrics/reporters/SolrJmxReporterTest.java | 13 +-
.../reporters/solr/SolrCloudReportersTest.java | 163 ++++++
.../reporters/solr/SolrShardReporterTest.java | 117 ++++
.../solr/rest/schema/TestBulkSchemaAPI.java | 2 +-
.../solr/schema/AbstractCurrencyFieldTest.java | 2 +-
.../org/apache/solr/schema/DateFieldTest.java | 16 +-
.../org/apache/solr/schema/DocValuesTest.java | 2 +-
.../org/apache/solr/schema/PolyFieldTest.java | 8 +-
.../solr/schema/PreAnalyzedFieldTest.java | 10 +-
.../apache/solr/schema/SortableBinaryField.java | 6 +-
.../org/apache/solr/schema/TestPointFields.java | 561 ++++++++++++++++++-
.../schema/TestSchemalessBufferedUpdates.java | 2 +-
.../apache/solr/search/TestSolr4Spatial.java | 61 +-
.../apache/solr/search/TestSolrQueryParser.java | 12 +-
.../solr/search/function/TestFunctionQuery.java | 1 -
.../solr/security/BasicAuthIntegrationTest.java | 4 +-
.../security/TestPKIAuthenticationPlugin.java | 10 +-
.../TestRuleBasedAuthorizationPlugin.java | 23 +
.../solr/store/blockcache/BlockCacheTest.java | 36 +-
.../solr/update/DirectUpdateHandlerTest.java | 108 +++-
.../apache/solr/update/DocumentBuilderTest.java | 317 +----------
.../solr/update/TestInPlaceUpdatesDistrib.java | 108 +++-
.../update/TestInPlaceUpdatesStandalone.java | 27 +
.../org/apache/solr/update/UpdateLogTest.java | 7 +-
.../update/processor/AtomicUpdatesTest.java | 28 +-
.../CloneFieldUpdateProcessorFactoryTest.java | 14 +-
.../DefaultValueUpdateProcessorTest.java | 7 +-
.../FieldMutatingUpdateProcessorTest.java | 14 +-
.../ParsingFieldUpdateProcessorsTest.java | 10 +-
.../processor/TolerantUpdateProcessorTest.java | 16 +-
.../UUIDUpdateProcessorFallbackTest.java | 3 +-
.../processor/UpdateProcessorTestBase.java | 7 +-
.../apache/solr/util/stats/MetricUtilsTest.java | 54 +-
solr/server/etc/jetty.xml | 54 +-
.../basic_configs/conf/managed-schema | 7 +-
.../conf/managed-schema | 7 +-
.../conf/managed-schema | 7 +-
.../conf/solrconfig.xml | 2 +-
solr/site/quickstart.mdtext | 2 -
.../solrj/beans/DocumentObjectBinder.java | 4 +-
.../client/solrj/impl/BinaryRequestWriter.java | 4 +-
.../solr/client/solrj/impl/CloudSolrClient.java | 21 +-
.../solr/client/solrj/io/SolrClientCache.java | 26 +-
.../solrj/io/eval/NaturalLogEvaluator.java | 60 ++
.../solrj/io/stream/SignificantTermsStream.java | 58 +-
.../client/solrj/io/stream/TupleStream.java | 94 ++++
.../request/JavaBinUpdateRequestCodec.java | 29 +-
.../solr/client/solrj/util/ClientUtils.java | 32 +-
.../apache/solr/common/SolrInputDocument.java | 53 +-
.../org/apache/solr/common/SolrInputField.java | 28 +-
.../solr/common/params/HighlightParams.java | 1 +
.../apache/solr/common/util/JavaBinCodec.java | 34 +-
.../solr/client/solrj/SolrExampleTests.java | 76 +--
.../solr/client/solrj/SolrExampleTestsBase.java | 14 +-
.../solrj/embedded/SolrExampleJettyTest.java | 2 +-
.../client/solrj/impl/CloudSolrClientTest.java | 48 ++
.../solr/client/solrj/io/sql/JdbcTest.java | 19 +
.../solrj/io/stream/StreamExpressionTest.java | 234 +++++---
.../io/stream/eval/NaturalLogEvaluatorTest.java | 98 ++++
.../client/solrj/request/TestCoreAdmin.java | 4 +-
.../solrj/request/TestUpdateRequestCodec.java | 20 +-
.../apache/solr/common/SolrDocumentTest.java | 6 +-
.../java/org/apache/solr/SolrTestCaseJ4.java | 86 +--
solr/webapp/web/css/angular/collections.css | 17 +
.../web/js/angular/controllers/collections.js | 14 +
solr/webapp/web/js/angular/services.js | 1 +
solr/webapp/web/partials/collections.html | 18 +-
313 files changed, 10129 insertions(+), 5872 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/386a5596/solr/core/src/java/org/apache/solr/core/SolrCore.java
----------------------------------------------------------------------