lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cpoersc...@apache.org
Subject [36/36] lucene-solr:jira/solr-6203: Merge branch 'master' into jira/solr-6203
Date Tue, 04 Apr 2017 15:33:18 GMT
Merge branch 'master' into jira/solr-6203

Resolved Conflicts:
	solr/core/src/java/org/apache/solr/search/grouping/Command.java
	solr/core/src/java/org/apache/solr/search/grouping/distributed/command/TopGroupsFieldCommand.java


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

Branch: refs/heads/jira/solr-6203
Commit: 832653ae905f9e3cf4643be0d5df5f32c7b00599
Parents: 92b76ab 05749d0
Author: Christine Poerschke <cpoerschke@apache.org>
Authored: Tue Apr 4 16:20:40 2017 +0100
Committer: Christine Poerschke <cpoerschke@apache.org>
Committed: Tue Apr 4 16:20:40 2017 +0100

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |   21 +-
 .../lucene50/Lucene50SegmentInfoFormat.java     |    2 +-
 .../lucene/codecs/lucene62/Lucene62Codec.java   |    2 +-
 .../apache/lucene/index/FixBrokenOffsets.java   |    3 +
 .../lucene50/Lucene50RWSegmentInfoFormat.java   |    2 +-
 .../lucene50/TestLucene50SegmentInfoFormat.java |   10 +
 .../lucene53/TestLucene53NormsFormat.java       |    6 +
 .../lucene/codecs/lucene62/Lucene62RWCodec.java |   12 +
 .../lucene62/Lucene62RWSegmentInfoFormat.java   |  193 +
 .../lucene62/TestLucene62SegmentInfoFormat.java |   48 +
 .../index/TestBackwardsCompatibility.java       |   69 +-
 .../lucene/index/TestFixBrokenOffsets.java      |   10 +-
 .../lucene/index/TestIndexWriterOnOldIndex.java |    6 +-
 .../byTask/feeds/EnwikiContentSourceTest.java   |    4 +-
 .../simpletext/SimpleTextSegmentInfoFormat.java |   29 +-
 .../lucene62/Lucene62SegmentInfoFormat.java     |  152 +-
 .../lucene/codecs/lucene70/Lucene70Codec.java   |    3 +-
 .../lucene70/Lucene70SegmentInfoFormat.java     |  439 ++
 .../org/apache/lucene/index/CheckIndex.java     |    2 +-
 .../lucene/index/DocumentsWriterPerThread.java  |    2 +-
 .../apache/lucene/index/FilterCodecReader.java  |    5 +-
 .../apache/lucene/index/FilterLeafReader.java   |    5 +-
 .../org/apache/lucene/index/IndexWriter.java    |   54 +-
 .../apache/lucene/index/IndexWriterConfig.java  |    2 +-
 .../org/apache/lucene/index/LeafMetaData.java   |   74 +
 .../org/apache/lucene/index/LeafReader.java     |    7 +-
 .../apache/lucene/index/MergeReaderWrapper.java |    5 +-
 .../org/apache/lucene/index/MergeState.java     |    2 +-
 .../apache/lucene/index/ParallelLeafReader.java |   36 +-
 .../apache/lucene/index/ReadersAndUpdates.java  |    4 +-
 .../org/apache/lucene/index/SegmentInfo.java    |   19 +-
 .../org/apache/lucene/index/SegmentInfos.java   |   77 +-
 .../org/apache/lucene/index/SegmentMerger.java  |   14 +
 .../org/apache/lucene/index/SegmentReader.java  |   10 +-
 .../lucene/index/SlowCodecReaderWrapper.java    |    5 +-
 .../lucene/index/StandardDirectoryReader.java   |    4 +-
 .../EarlyTerminatingSortingCollector.java       |    2 +-
 .../org/apache/lucene/search/LRUQueryCache.java |   32 +-
 .../org/apache/lucene/search/ReqExclScorer.java |    2 +-
 .../lucene62/TestLucene62SegmentInfoFormat.java |   39 -
 .../lucene70/TestLucene70SegmentInfoFormat.java |   35 +
 .../org/apache/lucene/index/TestCodecs.java     |    4 +-
 .../apache/lucene/index/TestCustomNorms.java    |   14 +-
 .../index/TestDemoParallelLeafReader.java       |    3 +-
 .../test/org/apache/lucene/index/TestDoc.java   |    8 +-
 .../apache/lucene/index/TestDocumentWriter.java |    9 +-
 .../apache/lucene/index/TestIndexSorting.java   |    2 +-
 .../apache/lucene/index/TestIndexWriter.java    |    2 +-
 .../index/TestIndexWriterThreadsToSegments.java |    3 +-
 .../test/org/apache/lucene/index/TestNorms.java |   12 +-
 .../index/TestOneMergeWrappingMergePolicy.java  |    1 +
 .../lucene/index/TestSameTokenSamePosition.java |    4 +-
 .../apache/lucene/index/TestSegmentInfos.java   |   22 +-
 .../apache/lucene/index/TestSegmentMerger.java  |    7 +-
 .../apache/lucene/index/TestSegmentReader.java  |    3 +-
 .../lucene/index/TestSegmentTermDocs.java       |    7 +-
 .../lucene/search/TestAutomatonQuery.java       |    2 +-
 .../search/TestAutomatonQueryUnicode.java       |    2 +-
 .../TestEarlyTerminatingSortingCollector.java   |   12 +-
 .../apache/lucene/search/TestLRUQueryCache.java |   76 +
 .../apache/lucene/search/TestRegexpQuery.java   |    2 +-
 .../lucene/search/TestSearchWithThreads.java    |    2 +-
 .../apache/lucene/store/TestRAMDirectory.java   |   26 +-
 .../grouping/DistinctValuesCollectorTest.java   |   48 +-
 .../search/highlight/TermVectorLeafReader.java  |    7 +-
 .../uhighlight/LengthGoalBreakIteratorTest.java |   26 +-
 .../vectorhighlight/AbstractTestCase.java       |    6 +-
 .../apache/lucene/index/memory/MemoryIndex.java |    6 +-
 .../org/apache/lucene/index/IndexSplitter.java  |    4 +-
 .../search/DiversifiedTopDocsCollector.java     |    5 +-
 .../surround/parser/QueryParser.java            |   41 +-
 .../queryparser/surround/parser/QueryParser.jj  |   45 +-
 .../queryparser/surround/query/FieldsQuery.java |    4 +-
 .../lucene/replicator/nrt/ReplicaNode.java      |    2 +-
 .../lucene/spatial3d/geom/GeoBBoxTest.java      |    2 +-
 .../mockrandom/MockRandomPostingsFormat.java    |    2 +-
 .../index/BaseCompoundFormatTestCase.java       |    3 +-
 .../index/BaseFieldInfoFormatTestCase.java      |    3 +-
 .../index/BaseIndexFileFormatTestCase.java      |   28 +-
 .../lucene/index/BaseNormsFormatTestCase.java   |    6 +-
 .../index/BaseSegmentInfoFormatTestCase.java    |   54 +-
 .../lucene/index/RandomPostingsTester.java      |    2 +-
 .../org/apache/lucene/search/QueryUtils.java    |    6 +-
 solr/CHANGES.txt                                |   28 +
 solr/README.txt                                 |    2 +-
 .../request/AnalyticsContentHandler.java        |   44 +-
 .../handler/dataimport/TestDocBuilder2.java     |   48 +-
 .../dataimport/TestHierarchicalDocBuilder.java  |   16 +-
 .../solr/ltr/feature/OriginalScoreFeature.java  |    2 +-
 .../ltr/feature/TestOriginalScoreFeature.java   |  120 +-
 .../org/apache/solr/cloud/DistributedMap.java   |   10 +-
 .../apache/solr/cloud/OverseerTaskQueue.java    |    6 +-
 .../org/apache/solr/core/CoreContainer.java     |   25 +-
 .../java/org/apache/solr/core/NodeConfig.java   |   25 +-
 .../java/org/apache/solr/core/SolrCores.java    |  166 +-
 .../org/apache/solr/core/SolrXmlConfig.java     |    5 +
 .../solr/core/TransientSolrCoreCache.java       |  127 +
 .../core/TransientSolrCoreCacheDefault.java     |  198 +
 .../core/TransientSolrCoreCacheFactory.java     |   85 +
 .../TransientSolrCoreCacheFactoryDefault.java   |   31 +
 .../apache/solr/handler/AnalyzeEvaluator.java   |  110 +
 .../org/apache/solr/handler/StreamHandler.java  |   82 +-
 .../solr/handler/admin/MetricsHandler.java      |    3 +-
 .../solr/index/SlowCompositeReaderWrapper.java  |   19 +-
 .../org/apache/solr/request/SimpleFacets.java   |   16 +-
 .../org/apache/solr/schema/CurrencyField.java   |    2 +-
 .../solr/search/facet/FacetFieldMerger.java     |   25 +
 .../solr/search/facet/FacetFieldProcessor.java  |   14 +
 .../search/facet/FacetRequestSortedMerger.java  |    8 +
 .../org/apache/solr/update/CommitTracker.java   |    6 +-
 .../org/apache/solr/util/SimplePostTool.java    |    2 +-
 .../src/java/org/apache/solr/util/SolrCLI.java  |   18 +-
 solr/core/src/test-files/solr/solr.xml          |    5 +
 .../org/apache/solr/cloud/OverseerTest.java     |  134 +-
 .../cloud/SegmentTerminateEarlyTestState.java   |   78 +-
 .../org/apache/solr/cloud/SolrXmlInZkTest.java  |    2 +-
 .../apache/solr/cloud/TestSegmentSorting.java   |    2 +-
 .../org/apache/solr/cloud/ZkControllerTest.java |    9 +-
 .../solr/core/OpenCloseCoreStressTest.java      |    6 +-
 .../org/apache/solr/core/TestCoreDiscovery.java |    7 +-
 .../org/apache/solr/core/TestLazyCores.java     |   53 +-
 .../solr/handler/admin/MetricsHandlerTest.java  |    7 +-
 .../solr/schema/SpatialRPTFieldTypeTest.java    |   12 +-
 .../test/org/apache/solr/search/TestDocSet.java |    7 +-
 .../org/apache/solr/search/TestRTGBase.java     |    2 +-
 .../org/apache/solr/search/TestRealTimeGet.java |    4 +-
 .../apache/solr/search/TestReloadDeadlock.java  |    2 +-
 .../apache/solr/search/TestStressLucene.java    |    8 +-
 .../apache/solr/search/TestStressRecovery.java  |    4 +-
 .../apache/solr/search/TestStressReorder.java   |    4 +-
 .../solr/search/TestStressUserVersions.java     |    6 +-
 .../apache/solr/search/TestStressVersions.java  |    4 +-
 .../search/facet/TestJsonFacetRefinement.java   |   66 +-
 .../apache/solr/util/TestSolrCLIRunExample.java |   38 +
 solr/example/README.txt                         |    2 +-
 solr/example/example-DIH/README.txt             |   11 +-
 .../solr/atom/conf/atom-data-config.xml         |   35 +
 .../solr/atom/conf/lang/stopwords_en.txt        |   54 +
 .../example-DIH/solr/atom/conf/managed-schema   |  106 +
 .../example-DIH/solr/atom/conf/protwords.txt    |   17 +
 .../example-DIH/solr/atom/conf/solrconfig.xml   |   61 +
 .../example-DIH/solr/atom/conf/synonyms.txt     |   29 +
 .../example-DIH/solr/atom/conf/url_types.txt    |    1 +
 .../example-DIH/solr/atom/core.properties       |    0
 .../example-DIH/solr/rss/conf/admin-extra.html  |   24 -
 .../solr/rss/conf/admin-extra.menu-bottom.html  |   25 -
 .../solr/rss/conf/admin-extra.menu-top.html     |   25 -
 .../clustering/carrot2/kmeans-attributes.xml    |   19 -
 .../clustering/carrot2/lingo-attributes.xml     |   24 -
 .../conf/clustering/carrot2/stc-attributes.xml  |   19 -
 .../example-DIH/solr/rss/conf/currency.xml      |   67 -
 .../example-DIH/solr/rss/conf/elevate.xml       |   42 -
 .../solr/rss/conf/lang/contractions_ca.txt      |    8 -
 .../solr/rss/conf/lang/contractions_fr.txt      |   15 -
 .../solr/rss/conf/lang/contractions_ga.txt      |    5 -
 .../solr/rss/conf/lang/contractions_it.txt      |   23 -
 .../solr/rss/conf/lang/hyphenations_ga.txt      |    5 -
 .../solr/rss/conf/lang/stemdict_nl.txt          |    6 -
 .../solr/rss/conf/lang/stoptags_ja.txt          |  420 --
 .../solr/rss/conf/lang/stopwords_ar.txt         |  125 -
 .../solr/rss/conf/lang/stopwords_bg.txt         |  193 -
 .../solr/rss/conf/lang/stopwords_ca.txt         |  220 -
 .../solr/rss/conf/lang/stopwords_ckb.txt        |  136 -
 .../solr/rss/conf/lang/stopwords_cz.txt         |  172 -
 .../solr/rss/conf/lang/stopwords_da.txt         |  110 -
 .../solr/rss/conf/lang/stopwords_de.txt         |  294 --
 .../solr/rss/conf/lang/stopwords_el.txt         |   78 -
 .../solr/rss/conf/lang/stopwords_en.txt         |   54 -
 .../solr/rss/conf/lang/stopwords_es.txt         |  356 --
 .../solr/rss/conf/lang/stopwords_eu.txt         |   99 -
 .../solr/rss/conf/lang/stopwords_fa.txt         |  313 --
 .../solr/rss/conf/lang/stopwords_fi.txt         |   97 -
 .../solr/rss/conf/lang/stopwords_fr.txt         |  186 -
 .../solr/rss/conf/lang/stopwords_ga.txt         |  110 -
 .../solr/rss/conf/lang/stopwords_gl.txt         |  161 -
 .../solr/rss/conf/lang/stopwords_hi.txt         |  235 --
 .../solr/rss/conf/lang/stopwords_hu.txt         |  211 -
 .../solr/rss/conf/lang/stopwords_hy.txt         |   46 -
 .../solr/rss/conf/lang/stopwords_id.txt         |  359 --
 .../solr/rss/conf/lang/stopwords_it.txt         |  303 --
 .../solr/rss/conf/lang/stopwords_ja.txt         |  127 -
 .../solr/rss/conf/lang/stopwords_lv.txt         |  172 -
 .../solr/rss/conf/lang/stopwords_nl.txt         |  119 -
 .../solr/rss/conf/lang/stopwords_no.txt         |  194 -
 .../solr/rss/conf/lang/stopwords_pt.txt         |  253 --
 .../solr/rss/conf/lang/stopwords_ro.txt         |  233 --
 .../solr/rss/conf/lang/stopwords_ru.txt         |  243 --
 .../solr/rss/conf/lang/stopwords_sv.txt         |  133 -
 .../solr/rss/conf/lang/stopwords_th.txt         |  119 -
 .../solr/rss/conf/lang/stopwords_tr.txt         |  212 -
 .../solr/rss/conf/lang/userdict_ja.txt          |   29 -
 .../example-DIH/solr/rss/conf/managed-schema    | 1096 -----
 .../solr/rss/conf/mapping-FoldToASCII.txt       | 3813 ------------------
 .../solr/rss/conf/mapping-ISOLatin1Accent.txt   |  246 --
 .../example-DIH/solr/rss/conf/protwords.txt     |   21 -
 .../solr/rss/conf/rss-data-config.xml           |   26 -
 .../example-DIH/solr/rss/conf/solrconfig.xml    | 1396 -------
 .../example-DIH/solr/rss/conf/spellings.txt     |    2 -
 .../example-DIH/solr/rss/conf/stopwords.txt     |   14 -
 .../example-DIH/solr/rss/conf/synonyms.txt      |   29 -
 .../example-DIH/solr/rss/conf/update-script.js  |   53 -
 .../example-DIH/solr/rss/conf/xslt/example.xsl  |  132 -
 .../solr/rss/conf/xslt/example_atom.xsl         |   67 -
 .../solr/rss/conf/xslt/example_rss.xsl          |   66 -
 .../example-DIH/solr/rss/conf/xslt/luke.xsl     |  337 --
 .../solr/rss/conf/xslt/updateXml.xsl            |   70 -
 .../example-DIH/solr/rss/core.properties        |    0
 .../example-DIH/solr/tika/conf/admin-extra.html |   24 -
 .../solr/tika/conf/admin-extra.menu-bottom.html |   25 -
 .../solr/tika/conf/admin-extra.menu-top.html    |   25 -
 .../example-DIH/solr/tika/conf/managed-schema   |  910 +----
 .../example-DIH/solr/tika/conf/solrconfig.xml   | 1354 +------
 .../solr/tika/conf/tika-data-config.xml         |   33 +-
 .../solrj/io/eval/ArcCosineEvaluator.java       |   60 +
 .../client/solrj/io/eval/ArcSineEvaluator.java  |   60 +
 .../solrj/io/eval/ArcTangentEvaluator.java      |   60 +
 .../client/solrj/io/eval/BooleanEvaluator.java  |    2 +-
 .../client/solrj/io/eval/CeilingEvaluator.java  |   61 +
 .../client/solrj/io/eval/CoalesceEvaluator.java |   52 +
 .../client/solrj/io/eval/ComplexEvaluator.java  |    6 +
 .../solrj/io/eval/ConditionalEvaluator.java     |    2 +-
 .../client/solrj/io/eval/CosineEvaluator.java   |   60 +
 .../solrj/io/eval/CubedRootEvaluator.java       |   60 +
 .../client/solrj/io/eval/FloorEvaluator.java    |   61 +
 .../io/eval/HyperbolicCosineEvaluator.java      |   60 +
 .../solrj/io/eval/HyperbolicSineEvaluator.java  |   60 +
 .../io/eval/HyperbolicTangentEvaluator.java     |   60 +
 .../client/solrj/io/eval/ModuloEvaluator.java   |   78 +
 .../client/solrj/io/eval/PowerEvaluator.java    |   61 +
 .../client/solrj/io/eval/RoundEvaluator.java    |   60 +
 .../client/solrj/io/eval/SimpleEvaluator.java   |    7 +
 .../client/solrj/io/eval/SineEvaluator.java     |   60 +
 .../solrj/io/eval/SquareRootEvaluator.java      |   60 +
 .../client/solrj/io/eval/StreamEvaluator.java   |    2 +
 .../client/solrj/io/eval/TangentEvaluator.java  |   60 +
 .../client/solrj/io/eval/UuidEvaluator.java     |   57 +
 .../solrj/io/stream/CartesianProductStream.java |    6 +-
 .../client/solrj/io/stream/SelectStream.java    |    6 +
 .../solrj/io/stream/StreamExpressionTest.java   |  132 +-
 .../io/stream/eval/ArcCosineEvaluatorTest.java  |   91 +
 .../io/stream/eval/ArcSineEvaluatorTest.java    |   91 +
 .../io/stream/eval/ArcTangentEvaluatorTest.java |   91 +
 .../io/stream/eval/CeilingEvaluatorTest.java    |   96 +
 .../io/stream/eval/CoalesceEvaluatorTest.java   |  112 +
 .../io/stream/eval/CosineEvaluatorTest.java     |   91 +
 .../io/stream/eval/CubedRootEvaluatorTest.java  |   91 +
 .../io/stream/eval/FloorEvaluatorTest.java      |   96 +
 .../eval/HyperbolicCosineEvaluatorTest.java     |   91 +
 .../eval/HyperbolicSineEvaluatorTest.java       |   91 +
 .../eval/HyperbolicTangentEvaluatorTest.java    |   91 +
 .../io/stream/eval/ModuloEvaluatorTest.java     |  164 +
 .../io/stream/eval/PowerEvaluatorTest.java      |  119 +
 .../io/stream/eval/RoundEvaluatorTest.java      |   95 +
 .../solrj/io/stream/eval/SineEvaluatorTest.java |   91 +
 .../io/stream/eval/SquareRootEvaluatorTest.java |   91 +
 .../io/stream/eval/TangentEvaluatorTest.java    |   91 +
 .../solrj/io/stream/eval/UuidEvaluatorTest.java |   52 +
 .../solr/common/util/TestJavaBinCodec.java      |    4 +-
 .../java/org/apache/solr/SolrTestCaseJ4.java    |   13 +-
 259 files changed, 6110 insertions(+), 17043 deletions(-)
----------------------------------------------------------------------



Mime
View raw message