You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2016/12/13 20:30:49 UTC

[42/42] lucene-solr:feature/metrics: Merge branch 'master' into feature/metrics

Merge branch 'master' into feature/metrics


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/054f38ff
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/054f38ff
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/054f38ff

Branch: refs/heads/feature/metrics
Commit: 054f38ff5be9bdd5a552a4feae6a361ba1cfa267
Parents: 3ba5d7d 8c79ab2
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue Dec 13 21:29:49 2016 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue Dec 13 21:29:49 2016 +0100

----------------------------------------------------------------------
 .gitignore                                      |    1 +
 dev-tools/scripts/smokeTestRelease.py           |    1 -
 lucene/CHANGES.txt                              |   29 +
 .../classification/utils/DatasetSplitter.java   |    3 +-
 .../codecs/memory/DirectPostingsFormat.java     |    3 +
 .../lucene/codecs/memory/FSTOrdTermsReader.java |    3 +
 .../lucene/codecs/memory/FSTTermsReader.java    |    3 +
 .../codecs/simpletext/SimpleTextBKDReader.java  |  281 ++-
 .../codecs/simpletext/SimpleTextBKDWriter.java  | 1661 ++++++++++++++++++
 .../simpletext/SimpleTextPointsReader.java      |    5 +-
 .../simpletext/SimpleTextPointsWriter.java      |  190 +-
 .../lucene/codecs/blocktree/FieldReader.java    |    3 +
 .../CompressingStoredFieldsWriter.java          |   19 +-
 .../CompressingTermVectorsWriter.java           |   11 +-
 .../GrowableByteArrayDataOutput.java            |   83 -
 .../codecs/lucene60/Lucene60PointsFormat.java   |   10 +-
 .../lucene/codecs/lucene60/package-info.java    |    4 +-
 .../lucene/codecs/lucene62/package-info.java    |    4 +-
 .../lucene/codecs/lucene70/package-info.java    |   15 +-
 .../org/apache/lucene/index/CheckIndex.java     |  312 ++--
 .../org/apache/lucene/index/IndexWriter.java    |   63 +-
 .../apache/lucene/index/IndexWriterConfig.java  |    3 +
 .../lucene/index/LiveIndexWriterConfig.java     |   13 +
 .../apache/lucene/index/SegmentCoreReaders.java |    8 +
 .../src/java/org/apache/lucene/index/Terms.java |    8 +-
 .../store/GrowableByteArrayDataOutput.java      |  103 ++
 .../org/apache/lucene/store/MMapDirectory.java  |    4 +-
 .../org/apache/lucene/util/bkd/BKDReader.java   |  654 ++++---
 .../org/apache/lucene/util/bkd/BKDWriter.java   |  370 +++-
 .../apache/lucene/util/bkd/DocIdsWriter.java    |    4 +-
 .../apache/lucene/util/bkd/HeapPointReader.java |    7 +-
 .../apache/lucene/util/bkd/HeapPointWriter.java |   22 +-
 .../util/bkd/MutablePointsReaderUtils.java      |   21 +-
 .../lucene/util/bkd/OfflinePointReader.java     |    8 +-
 .../lucene/util/bkd/OfflinePointWriter.java     |   10 +-
 .../org/apache/lucene/util/bkd/PointReader.java |   14 +-
 .../org/apache/lucene/util/bkd/PointWriter.java |    6 +-
 .../TestGrowableByteArrayDataOutput.java        |   80 -
 .../apache/lucene/index/TestIndexSorting.java   |   30 +-
 .../org/apache/lucene/index/TestTermsEnum.java  |   18 +
 .../index/TestTragicIndexWriterDeadlock.java    |   69 +-
 .../apache/lucene/search/TestPointQueries.java  |    3 +
 .../store/TestGrowableByteArrayDataOutput.java  |   80 +
 .../apache/lucene/util/bkd/Test2BBKDPoints.java |   11 +-
 .../org/apache/lucene/util/bkd/TestBKD.java     |   54 +
 .../org/apache/lucene/util/fst/TestFSTs.java    |    2 +-
 .../uhighlight/MemoryIndexOffsetStrategy.java   |   10 +-
 .../uhighlight/MultiTermHighlighting.java       |   37 +-
 .../lucene/search/uhighlight/PhraseHelper.java  |  158 +-
 .../search/uhighlight/UnifiedHighlighter.java   |   64 +-
 .../uhighlight/TestUnifiedHighlighter.java      |  275 +++
 .../TestUnifiedHighlighterExtensibility.java    |    3 +-
 lucene/ivy-versions.properties                  |    2 +-
 .../apache/lucene/document/NearestNeighbor.java |   44 +-
 solr/CHANGES.txt                                |   40 +
 .../TestPlainTextEntityProcessor.java           |  106 ++
 solr/contrib/ltr/README.md                      |    6 +-
 .../java/org/apache/solr/ltr/FeatureLogger.java |   10 +-
 .../org/apache/solr/ltr/LTRScoringQuery.java    |   22 +-
 .../org/apache/solr/ltr/LTRThreadModule.java    |   29 +
 .../org/apache/solr/ltr/feature/Feature.java    |    3 +-
 .../solr/ltr/feature/FieldValueFeature.java     |   18 +-
 .../solr/ltr/feature/OriginalScoreFeature.java  |   12 +-
 .../apache/solr/ltr/feature/SolrFeature.java    |   17 +-
 .../ltr/store/rest/ManagedFeatureStore.java     |    1 -
 .../solr/ltr/store/rest/ManagedModelStore.java  |   32 +-
 .../test-files/solr/collection1/conf/schema.xml |    2 +
 .../solr/ltr/feature/TestFieldValueFeature.java |   48 +-
 .../ltr/feature/TestOriginalScoreScorer.java    |   47 +
 .../model/TestMultipleAdditiveTreesModel.java   |   44 +-
 .../solr/cloud/CloudConfigSetService.java       |   24 +-
 .../org/apache/solr/cloud/CloudDescriptor.java  |    2 +-
 .../apache/solr/cloud/CreateCollectionCmd.java  |  146 +-
 .../org/apache/solr/cloud/ElectionContext.java  |   20 +-
 .../org/apache/solr/cloud/LeaderElector.java    |    9 +-
 .../org/apache/solr/cloud/ZkController.java     |  128 +-
 .../apache/solr/cloud/ZkSolrResourceLoader.java |    2 +-
 .../org/apache/solr/core/ConfigSetService.java  |    7 +-
 .../org/apache/solr/core/CoreContainer.java     |    2 +-
 .../src/java/org/apache/solr/core/SolrCore.java |    8 -
 .../solr/handler/admin/CollectionsHandler.java  |    2 +
 .../solr/handler/admin/SystemInfoHandler.java   |   51 +-
 .../solr/handler/component/ExpandComponent.java |    6 +
 .../solr/handler/component/QueryComponent.java  |   34 +-
 .../component/QueryElevationComponent.java      |   28 +-
 .../java/org/apache/solr/schema/BoolField.java  |    4 +-
 .../solr/schema/ManagedIndexSchemaFactory.java  |   12 +
 .../org/apache/solr/schema/SchemaManager.java   |    2 +-
 .../apache/solr/search/SolrFieldCacheMBean.java |    2 +
 .../apache/solr/search/SolrIndexSearcher.java   |   26 +
 .../java/org/apache/solr/search/SortSpec.java   |   10 +
 .../facet/FacetFieldProcessorByArrayDV.java     |   49 +-
 .../org/apache/solr/search/facet/FieldUtil.java |  147 ++
 .../search/grouping/GroupingSpecification.java  |   70 +-
 .../distributed/command/QueryCommand.java       |    2 +-
 .../SearchGroupShardResponseProcessor.java      |    4 +-
 .../TopGroupsShardResponseProcessor.java        |    8 +-
 .../GroupedEndResultTransformer.java            |    4 +-
 .../org/apache/solr/uninverting/FieldCache.java |   16 +-
 .../apache/solr/uninverting/FieldCacheImpl.java |  182 +-
 .../uninverting/FieldCacheSanityChecker.java    |    3 +-
 .../solr/uninverting/UninvertingReader.java     |   10 +
 .../processor/DistributedUpdateProcessor.java   |    8 +-
 .../apache/solr/util/RecordingJSONParser.java   |   17 +-
 .../solr/cloud/DocValuesNotIndexedTest.java     |   64 +-
 .../apache/solr/cloud/LeaderElectionTest.java   |    2 +
 ...verseerCollectionConfigSetProcessorTest.java |   33 +-
 .../org/apache/solr/cloud/ZkSolrClientTest.java |   54 +
 .../handler/component/TestExpandComponent.java  |   15 +
 .../ManagedSchemaRoundRobinCloudTest.java       |   98 ++
 .../solr/search/TestSolrFieldCacheMBean.java    |    1 +
 solr/licenses/commons-fileupload-1.3.1.jar.sha1 |    1 -
 solr/licenses/commons-fileupload-1.3.2.jar.sha1 |    1 +
 .../solrj/impl/ConcurrentUpdateSolrClient.java  |   16 +-
 .../java/org/apache/solr/common/PushWriter.java |    2 +-
 .../apache/solr/common/cloud/SolrZkClient.java  |   29 +-
 .../apache/solr/common/cloud/ZkCmdExecutor.java |   15 +-
 .../solr/client/solrj/SolrExampleTests.java     |    7 +-
 .../apache/solr/client/solrj/SolrQueryTest.java |    2 +-
 .../solr/common/util/TestJsonRecordReader.java  |   35 +-
 120 files changed, 5297 insertions(+), 1459 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/054f38ff/lucene/ivy-versions.properties
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/054f38ff/solr/CHANGES.txt
----------------------------------------------------------------------
diff --cc solr/CHANGES.txt
index 1279805,41af0ff..fab3076
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@@ -152,11 -161,12 +161,17 @@@ New Feature
  
  * SOLR-9728: Ability to specify Key Store type in solr.in.sh file for SSL (Michael Suzuki, Kevin Risden)
  
+ * SOLR-5043: New solr.dns.prevent.reverse.lookup system property that can be used to prevent long core
+   (re)load delays on systems with missconfigured hostname/DNS (hossman)
+ 
+ * SOLR-9844: FieldCache information fetched via the mbeans handler or seen via the UI now displays the total size used.
+   The individual cache entries in the response are now formatted better as well. (Varun Thacker)
+ 
 +* SOLR-9788: Use instrumented jetty classes provided by the dropwizard metric library. This also introduces a
 +  new /admin/metrics API endpoint to return all registered metrics in JSON format. (shalin)
 +
 +* SOLR-9805: Use metrics-jvm library to instrument jvm internals such as GC, memory usage and others. (shalin)
 +
  Optimizations
  ----------------------
  * SOLR-9704: Facet Module / JSON Facet API: Optimize blockChildren facets that have

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/054f38ff/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/054f38ff/solr/core/src/java/org/apache/solr/core/SolrCore.java
----------------------------------------------------------------------