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 2016/10/24 18:32:52 UTC
[48/50] [abbrv] lucene-solr:jira/solr-8542-v2: Merge commit '67f3f43'
into jira/solr-8542-v2
Merge commit '67f3f43' into jira/solr-8542-v2
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/88058099
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/88058099
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/88058099
Branch: refs/heads/jira/solr-8542-v2
Commit: 880580993eec9903758b75aaec143177c1430024
Parents: bfa05b8 67f3f43
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Oct 24 13:03:19 2016 -0500
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Oct 24 13:03:19 2016 -0500
----------------------------------------------------------------------
lucene/CHANGES.txt | 25 +
.../analysis/core/DecimalDigitFilter.java | 2 +-
.../lucene/analysis/hunspell/Stemmer.java | 2 +-
.../analysis/core/TestDecimalDigitFilter.java | 149 +-
.../analysis/ja/JapaneseNumberFilter.java | 11 +
.../lucene/analysis/ja/TestFactories.java | 203 ++
.../lucene54/Lucene54DocValuesProducer.java | 14 +-
.../lucene/codecs/lucene60/Lucene60Codec.java | 2 +-
.../lucene50/TestLucene50SegmentInfoFormat.java | 40 +
.../lucene/codecs/lucene60/Lucene60RWCodec.java | 38 +
.../lucene/benchmark/byTask/tasks/ReadTask.java | 15 +-
.../blocktreeords/OrdsIntersectTermsEnum.java | 2 +-
.../codecs/memory/DirectPostingsFormat.java | 2 +-
.../lucene/codecs/memory/FSTOrdTermsReader.java | 2 +-
.../lucene/codecs/memory/FSTTermsReader.java | 2 +-
.../codecs/simpletext/SimpleTextBKDReader.java | 1 -
.../simpletext/SimpleTextPointsReader.java | 81 +-
.../simpletext/SimpleTextPointsWriter.java | 10 +-
.../apache/lucene/codecs/DocValuesConsumer.java | 45 +-
.../lucene/codecs/MutablePointValues.java | 42 +
.../lucene/codecs/MutablePointsReader.java | 41 -
.../org/apache/lucene/codecs/PointsFormat.java | 35 +-
.../org/apache/lucene/codecs/PointsReader.java | 5 +-
.../org/apache/lucene/codecs/PointsWriter.java | 204 +-
.../codecs/blocktree/IntersectTermsEnum.java | 2 +-
.../codecs/lucene60/Lucene60PointsReader.java | 84 +-
.../codecs/lucene60/Lucene60PointsWriter.java | 28 +-
.../lucene/codecs/lucene70/IndexedDISI.java | 269 +++
.../lucene70/Lucene70DocValuesConsumer.java | 1001 +++-----
.../lucene70/Lucene70DocValuesFormat.java | 123 +-
.../lucene70/Lucene70DocValuesProducer.java | 2229 ++++++------------
.../codecs/lucene70/Lucene70NormsConsumer.java | 8 +-
.../codecs/lucene70/Lucene70NormsFormat.java | 4 +-
.../codecs/lucene70/Lucene70NormsProducer.java | 12 +-
.../lucene/codecs/lucene70/SparseDISI.java | 114 -
.../org/apache/lucene/document/BinaryPoint.java | 3 +-
.../java/org/apache/lucene/document/Field.java | 18 +-
.../apache/lucene/index/AutomatonTermsEnum.java | 6 +-
.../org/apache/lucene/index/CheckIndex.java | 19 +-
.../org/apache/lucene/index/CodecReader.java | 12 +
.../lucene/index/EmptyDocValuesProducer.java | 4 +-
.../java/org/apache/lucene/index/FieldInfo.java | 4 +
.../apache/lucene/index/FilterCodecReader.java | 5 -
.../apache/lucene/index/FilterLeafReader.java | 4 +-
.../org/apache/lucene/index/LeafReader.java | 5 +-
.../lucene/index/LegacySortedSetDocValues.java | 4 +-
.../apache/lucene/index/MergeReaderWrapper.java | 4 +-
.../apache/lucene/index/ParallelLeafReader.java | 97 +-
.../org/apache/lucene/index/PointValues.java | 64 +-
.../apache/lucene/index/PointValuesWriter.java | 66 +-
.../org/apache/lucene/index/SegmentReader.java | 8 +-
.../index/SingletonSortedSetDocValues.java | 2 +-
.../lucene/index/SlowCodecReaderWrapper.java | 46 +-
.../apache/lucene/index/SortedDocValues.java | 2 +-
.../apache/lucene/index/SortedSetDocValues.java | 2 +-
.../apache/lucene/index/SortingLeafReader.java | 33 +-
.../lucene/search/DisjunctionMaxQuery.java | 2 +-
.../lucene/search/DisjunctionMaxScorer.java | 2 +-
.../lucene/search/DocValuesRewriteMethod.java | 2 +-
.../org/apache/lucene/search/LRUQueryCache.java | 14 +-
.../apache/lucene/search/PointInSetQuery.java | 24 +-
.../apache/lucene/search/PointRangeQuery.java | 28 +-
.../org/apache/lucene/util/DocIdSetBuilder.java | 2 +-
.../lucene/util/automaton/ByteRunAutomaton.java | 2 +-
.../util/automaton/CharacterRunAutomaton.java | 4 +-
.../util/automaton/CompiledAutomaton.java | 2 +-
.../lucene/util/automaton/RunAutomaton.java | 15 +-
.../org/apache/lucene/util/bkd/BKDReader.java | 13 +-
.../org/apache/lucene/util/bkd/BKDWriter.java | 24 +-
.../util/bkd/MutablePointsReaderUtils.java | 10 +-
.../util/packed/DirectMonotonicReader.java | 2 -
.../lucene50/TestLucene50FieldInfoFormat.java | 33 -
.../lucene50/TestLucene60FieldInfoFormat.java | 33 +
.../lucene/codecs/lucene70/TestIndexedDISI.java | 223 ++
.../lucene70/TestLucene70DocValuesFormat.java | 116 +-
.../lucene/codecs/lucene70/TestSparseDISI.java | 94 -
.../org/apache/lucene/index/Test2BPoints.java | 4 +-
.../apache/lucene/index/TestBagOfPositions.java | 4 +-
.../apache/lucene/index/TestPointValues.java | 25 +-
.../org/apache/lucene/index/TestTermsEnum.java | 4 +-
.../lucene/search/TestDisjunctionMaxQuery.java | 16 +
.../apache/lucene/util/TestDocIdSetBuilder.java | 14 +-
.../lucene/util/automaton/TestUTF32ToUTF8.java | 4 +-
.../util/bkd/TestMutablePointsReaderUtils.java | 33 +-
.../search/highlight/TermVectorLeafReader.java | 2 +-
.../search/vectorhighlight/FieldQuery.java | 7 +
.../FastVectorHighlighterTest.java | 38 +
.../lucene/search/join/BlockJoinSelector.java | 4 +-
.../join/PointInSetIncludingScoreQuery.java | 10 +-
.../apache/lucene/index/memory/MemoryIndex.java | 91 +-
.../lucene/index/memory/TestMemoryIndex.java | 6 +-
.../queryparser/simple/SimpleQueryParser.java | 4 +
.../simple/TestSimpleQueryParser.java | 7 +
.../org/apache/lucene/document/LatLonPoint.java | 9 +-
.../document/LatLonPointDistanceQuery.java | 4 +-
.../document/LatLonPointInPolygonQuery.java | 4 +-
.../apache/lucene/document/RangeFieldQuery.java | 8 +-
.../spatial3d/PointInGeo3DShapeQuery.java | 4 +-
.../apache/lucene/spatial3d/TestGeo3DPoint.java | 4 +-
.../analysis/BaseTokenStreamTestCase.java | 3 +-
.../apache/lucene/analysis/MockTokenizer.java | 6 +-
.../codecs/asserting/AssertingPointsFormat.java | 139 +-
.../codecs/cranky/CrankyPointsFormat.java | 110 +-
.../lucene/index/AssertingLeafReader.java | 165 +-
.../lucene/index/BaseNormsFormatTestCase.java | 114 +-
.../lucene/index/BasePointsFormatTestCase.java | 49 +-
.../org/apache/lucene/index/RandomCodec.java | 9 +-
.../org/apache/lucene/search/QueryUtils.java | 2 +-
.../org/apache/lucene/util/LuceneTestCase.java | 4 +-
solr/CHANGES.txt | 36 +
solr/bin/solr | 28 +-
solr/bin/solr.cmd | 41 +-
solr/bin/solr.in.cmd | 3 +
solr/bin/solr.in.sh | 5 +-
.../apache/solr/cloud/CreateCollectionCmd.java | 1 +
.../org/apache/solr/cloud/ZkController.java | 23 +-
.../org/apache/solr/core/CoreContainer.java | 26 +-
.../java/org/apache/solr/core/SolrConfig.java | 30 +-
.../src/java/org/apache/solr/core/SolrCore.java | 83 +
.../java/org/apache/solr/core/ZkContainer.java | 4 +-
.../core/snapshots/SolrSnapshotManager.java | 130 +-
.../org/apache/solr/handler/IndexFetcher.java | 16 +-
.../solr/handler/MoreLikeThisHandler.java | 2 +-
.../org/apache/solr/handler/RestoreCore.java | 16 +-
.../org/apache/solr/handler/SQLHandler.java | 18 +-
.../org/apache/solr/handler/StreamHandler.java | 54 +-
.../solr/handler/admin/CoreAdminOperation.java | 4 +-
.../solr/handler/admin/DeleteSnapshotOp.java | 37 +-
.../solr/handler/component/QueryComponent.java | 6 +-
.../solr/handler/component/ResponseBuilder.java | 4 +-
.../solr/index/SlowCompositeReaderWrapper.java | 2 +-
.../org/apache/solr/schema/CurrencyField.java | 6 +-
.../java/org/apache/solr/schema/EnumField.java | 4 +-
.../java/org/apache/solr/schema/FieldType.java | 38 +-
.../java/org/apache/solr/schema/LatLonType.java | 6 +-
.../java/org/apache/solr/schema/PointType.java | 6 +-
.../apache/solr/schema/PreAnalyzedField.java | 4 +-
.../org/apache/solr/schema/SchemaField.java | 63 +-
.../org/apache/solr/schema/TrieDoubleField.java | 1 +
.../java/org/apache/solr/schema/TrieField.java | 3 +-
.../org/apache/solr/schema/TrieIntField.java | 1 +
.../org/apache/solr/schema/TrieLongField.java | 1 +
.../apache/solr/search/LuceneQParserPlugin.java | 8 +-
.../java/org/apache/solr/search/QParser.java | 10 +
.../apache/solr/search/facet/FacetBucket.java | 189 ++
.../apache/solr/search/facet/FacetModule.java | 166 --
.../search/facet/FacetRequestSortedMerger.java | 25 +-
.../solr/security/PKIAuthenticationPlugin.java | 18 +-
.../org/apache/solr/servlet/HttpSolrCall.java | 3 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 1 +
.../solr/servlet/StartupLoggingUtils.java | 9 +
.../apache/solr/uninverting/FieldCacheImpl.java | 22 +-
.../org/apache/solr/update/SolrIndexWriter.java | 14 +-
.../src/java/org/apache/solr/util/SolrCLI.java | 215 +-
.../cdcr-source-disabled/conf/schema.xml | 29 +
.../cdcr-source-disabled/conf/solrconfig.xml | 60 +
.../configsets/cdcr-source-disabled/schema.xml | 29 -
.../cdcr-source-disabled/solrconfig.xml | 60 -
.../solr/configsets/cdcr-source/conf/schema.xml | 29 +
.../configsets/cdcr-source/conf/solrconfig.xml | 76 +
.../solr/configsets/cdcr-source/schema.xml | 29 -
.../solr/configsets/cdcr-source/solrconfig.xml | 76 -
.../solr/configsets/cdcr-target/conf/schema.xml | 29 +
.../configsets/cdcr-target/conf/solrconfig.xml | 63 +
.../solr/configsets/cdcr-target/schema.xml | 29 -
.../solr/configsets/cdcr-target/solrconfig.xml | 63 -
.../solr/HelloWorldSolrCloudTestCase.java | 94 +
.../solr/client/solrj/ConnectionReuseTest.java | 198 --
.../client/solrj/impl/ConnectionReuseTest.java | 196 ++
.../solr/cloud/BaseCdcrDistributedZkTest.java | 1 +
.../apache/solr/cloud/CdcrBootstrapTest.java | 76 +-
...ConcurrentDeleteAndCreateCollectionTest.java | 12 +-
.../cloud/DistribJoinFromCollectionTest.java | 25 +-
.../solr/cloud/TestAuthenticationFramework.java | 45 +-
.../solr/cloud/TestCloudDeleteByQuery.java | 15 +-
.../solr/cloud/TestCloudPseudoReturnFields.java | 21 +-
.../apache/solr/cloud/TestConfigSetsAPI.java | 13 +-
.../cloud/TestConfigSetsAPIExclusivity.java | 10 +-
.../solr/cloud/TestConfigSetsAPIZkFailure.java | 2 +-
.../solr/cloud/TestMiniSolrCloudCluster.java | 54 +-
.../solr/cloud/TestMiniSolrCloudClusterSSL.java | 50 +-
.../apache/solr/cloud/TestRandomFlRTGCloud.java | 40 +-
.../solr/cloud/TestRequestForwarding.java | 4 +-
.../cloud/TestSolrCloudWithKerberosAlt.java | 3 +-
.../TestSolrCloudWithSecureImpersonation.java | 8 +-
.../TestStressCloudBlindAtomicUpdates.java | 35 +-
.../cloud/TestTolerantUpdateProcessorCloud.java | 23 +-
.../TestTolerantUpdateProcessorRandomCloud.java | 29 +-
.../org/apache/solr/cloud/rule/RulesTest.java | 13 +-
.../solr/core/BlobRepositoryCloudTest.java | 12 +-
.../test/org/apache/solr/core/HelloStream.java | 100 +
.../org/apache/solr/core/TestCodecSupport.java | 2 +-
.../org/apache/solr/core/TestCustomStream.java | 94 +
.../core/snapshots/TestSolrCoreSnapshots.java | 127 +-
.../solr/handler/PingRequestHandlerTest.java | 12 +-
.../apache/solr/handler/TestReqParamsAPI.java | 4 +-
.../solr/handler/TestSQLHandlerNonCloud.java | 92 +
.../handler/component/SearchHandlerTest.java | 15 +-
.../TestSubQueryTransformerDistrib.java | 18 +-
.../solr/schema/TestManagedSchemaAPI.java | 3 +-
.../test/org/apache/solr/search/TestDocSet.java | 2 +-
.../apache/solr/search/TestIndexSearcher.java | 6 +-
.../search/facet/TestJsonFacetRefinement.java | 214 ++
.../search/join/BlockJoinFacetDistribTest.java | 13 +-
.../solr/search/stats/TestDistribIDF.java | 7 +-
solr/server/resources/log4j.properties | 2 +-
.../solrj/impl/ConcurrentUpdateSolrClient.java | 3 +-
.../solr/client/solrj/impl/HttpClientUtil.java | 15 +-
.../solr/client/solrj/impl/HttpSolrClient.java | 6 +-
.../impl/SolrHttpClientContextBuilder.java | 12 +-
.../client/solrj/io/stream/FetchStream.java | 314 +++
.../solrj/request/CollectionAdminRequest.java | 14 +
.../solr/common/params/CoreAdminParams.java | 5 +
.../client/solrj/SolrSchemalessExampleTest.java | 16 +-
.../solrj/embedded/SolrExampleJettyTest.java | 6 +-
.../solrj/impl/HttpSolrClientConPoolTest.java | 189 ++
.../impl/HttpSolrClientSSLAuthConPoolTest.java | 40 +
.../solrj/io/stream/StreamExpressionTest.java | 167 ++
.../cloud/TestCollectionStateWatchers.java | 4 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 45 +-
.../org/apache/solr/util/RestTestHarness.java | 14 +-
221 files changed, 6220 insertions(+), 5081 deletions(-)
----------------------------------------------------------------------