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 2017/11/09 21:19:41 UTC
[35/50] [abbrv] lucene-solr:jira/solr-11285-sim: Merge branch
'master' into jira/solr-11285-sim
Merge branch 'master' into jira/solr-11285-sim
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/687d4c80
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/687d4c80
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/687d4c80
Branch: refs/heads/jira/solr-11285-sim
Commit: 687d4c804b84ac58097d5a16504fa189af943c30
Parents: f0646c7 67a6a14
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Wed Nov 8 22:26:50 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Wed Nov 8 22:26:50 2017 +0100
----------------------------------------------------------------------
build.xml | 37 +-
dev-tools/idea/lucene/facet/facet.iml | 10 +
lucene/CHANGES.txt | 36 +
.../codecs/blockterms/BlockTermsReader.java | 11 +-
.../blocktreeords/OrdsBlockTreeTermsReader.java | 7 +-
.../OrdsIntersectTermsEnumFrame.java | 4 +-
.../OrdsSegmentTermsEnumFrame.java | 4 +-
.../lucene/codecs/memory/FSTOrdTermsReader.java | 12 +-
.../lucene/codecs/memory/FSTTermsReader.java | 9 +-
.../codecs/memory/MemoryPostingsFormat.java | 15 +-
.../simpletext/SimpleTextFieldsReader.java | 7 +-
.../simpletext/SimpleTextTermVectorsReader.java | 8 +-
lucene/common-build.xml | 34 +-
.../codecs/blocktree/BlockTreeTermsReader.java | 7 +-
.../blocktree/IntersectTermsEnumFrame.java | 4 +-
.../codecs/blocktree/SegmentTermsEnumFrame.java | 4 +-
.../CompressingTermVectorsReader.java | 8 +-
.../apache/lucene/document/RangeFieldQuery.java | 6 +
.../SortedNumericDocValuesRangeQuery.java | 5 +
.../document/SortedSetDocValuesRangeQuery.java | 5 +
.../lucene/index/BaseCompositeReader.java | 25 +-
.../org/apache/lucene/index/CheckIndex.java | 75 +-
.../org/apache/lucene/index/IndexReader.java | 23 +-
.../org/apache/lucene/index/MultiTerms.java | 12 +-
.../org/apache/lucene/index/MultiTermsEnum.java | 4 +-
.../lucene/index/SortedDocValuesTermsEnum.java | 2 +-
.../index/SortedSetDocValuesTermsEnum.java | 2 +-
.../org/apache/lucene/index/TermContext.java | 8 +-
.../src/java/org/apache/lucene/index/Terms.java | 12 +-
.../java/org/apache/lucene/index/TermsEnum.java | 3 +-
.../org/apache/lucene/index/package-info.java | 13 +-
.../apache/lucene/search/BlendedTermQuery.java | 6 +-
.../org/apache/lucene/search/BooleanWeight.java | 6 +
.../lucene/search/CollectionStatistics.java | 116 ++-
.../lucene/search/ConstantScoreQuery.java | 5 +
.../lucene/search/DisjunctionMaxQuery.java | 5 +
.../search/DocValuesFieldExistsQuery.java | 6 +
.../lucene/search/DocValuesRewriteMethod.java | 11 +-
.../org/apache/lucene/search/FilterWeight.java | 6 +
.../lucene/search/IndexOrDocValuesQuery.java | 7 +
.../org/apache/lucene/search/LRUQueryCache.java | 11 +-
.../apache/lucene/search/MatchAllDocsQuery.java | 7 +
.../apache/lucene/search/MatchNoDocsQuery.java | 6 +
.../apache/lucene/search/MultiPhraseQuery.java | 5 +
.../MultiTermQueryConstantScoreWrapper.java | 6 +
.../lucene/search/NormsFieldExistsQuery.java | 6 +
.../org/apache/lucene/search/PhraseQuery.java | 12 +-
.../apache/lucene/search/PointInSetQuery.java | 6 +
.../apache/lucene/search/PointRangeQuery.java | 6 +
.../org/apache/lucene/search/QueryRescorer.java | 2 +-
.../org/apache/lucene/search/SynonymQuery.java | 11 +-
.../apache/lucene/search/TermInSetQuery.java | 5 +
.../org/apache/lucene/search/TermQuery.java | 12 +-
.../apache/lucene/search/TermStatistics.java | 62 +-
.../java/org/apache/lucene/search/Weight.java | 52 ++
.../search/similarities/BM25Similarity.java | 31 +-
.../search/similarities/ClassicSimilarity.java | 2 +-
.../search/similarities/SimilarityBase.java | 50 +-
.../search/similarities/TFIDFSimilarity.java | 36 +-
.../search/similarities/package-info.java | 8 +-
.../search/spans/SpanContainingQuery.java | 7 +
.../lucene/search/spans/SpanNearQuery.java | 10 +
.../lucene/search/spans/SpanNotQuery.java | 6 +
.../apache/lucene/search/spans/SpanOrQuery.java | 5 +
.../search/spans/SpanPositionCheckQuery.java | 5 +
.../lucene/search/spans/SpanTermQuery.java | 12 +-
.../lucene/search/spans/SpanWithinQuery.java | 7 +
.../lucene50/TestBlockPostingsFormat3.java | 23 +-
.../apache/lucene/index/TestMultiTermsEnum.java | 12 +-
.../org/apache/lucene/index/TestOmitTf.java | 6 +-
.../apache/lucene/search/JustCompileSearch.java | 6 +
.../apache/lucene/search/TestBooleanScorer.java | 5 +
.../apache/lucene/search/TestLRUQueryCache.java | 198 +++-
.../apache/lucene/search/TestNeedsScores.java | 13 +-
.../apache/lucene/search/TestQueryRescorer.java | 5 +
.../apache/lucene/search/TestScorerPerf.java | 5 +
.../apache/lucene/search/TestSortRandom.java | 5 +
.../TestUsageTrackingFilterCachingPolicy.java | 5 +
.../search/similarities/TestSimilarityBase.java | 13 +-
lucene/facet/build.xml | 1 +
lucene/facet/ivy.xml | 6 +
.../apache/lucene/facet/DrillSidewaysQuery.java | 10 +
.../lucene/facet/LongValueFacetCounts.java | 128 +--
.../apache/lucene/facet/range/DoubleRange.java | 5 +
.../apache/lucene/facet/range/LongRange.java | 5 +
.../facet/taxonomy/FastTaxonomyFacetCounts.java | 8 +-
.../facet/taxonomy/FloatTaxonomyFacets.java | 12 +-
.../facet/taxonomy/IntTaxonomyFacets.java | 149 ++-
.../facet/taxonomy/TaxonomyFacetCounts.java | 4 +-
.../TaxonomyFacetSumIntAssociations.java | 4 +-
.../lucene/facet/taxonomy/TaxonomyFacets.java | 47 +-
.../writercache/LruTaxonomyWriterCache.java | 4 +
.../writercache/TaxonomyWriterCache.java | 4 +-
.../writercache/UTF8TaxonomyWriterCache.java | 215 ++---
.../apache/lucene/facet/TestDrillSideways.java | 25 +-
.../facet/range/TestRangeFacetCounts.java | 19 +-
.../facet/taxonomy/TestTaxonomyFacetCounts.java | 8 +
.../TestConcurrentFacetedIndexing.java | 2 +
.../directory/TestDirectoryTaxonomyWriter.java | 2 +
.../TestUTF8TaxonomyWriterCache.java | 22 +-
.../highlight/TokenStreamFromTermVector.java | 9 +-
lucene/ivy-versions.properties | 4 +-
.../lucene/search/join/GlobalOrdinalsQuery.java | 6 +
.../join/ParentChildrenBlockJoinQuery.java | 5 +
.../join/PointInSetIncludingScoreQuery.java | 6 +
.../search/join/TermsIncludingScoreQuery.java | 6 +
.../apache/lucene/search/join/TestJoinUtil.java | 5 +
lucene/licenses/hppc-0.7.3.jar.sha1 | 1 +
lucene/licenses/hppc-LICENSE-ASL.txt | 177 ++++
lucene/licenses/hppc-NOTICE.txt | 0
lucene/licenses/ivy-2.3.0.jar.sha1 | 1 -
lucene/licenses/ivy-2.4.0.jar.sha1 | 1 +
.../apache/lucene/queries/BoostingQuery.java | 6 +
.../apache/lucene/queries/CustomScoreQuery.java | 10 +
.../lucene/queries/function/BoostedQuery.java | 5 +
.../queries/function/FunctionMatchQuery.java | 6 +
.../lucene/queries/function/FunctionQuery.java | 5 +
.../queries/function/FunctionRangeQuery.java | 6 +
.../queries/function/FunctionScoreQuery.java | 5 +
.../SumTotalTermFreqValueSource.java | 10 +-
.../valuesource/TotalTermFreqValueSource.java | 10 +-
.../queries/payloads/PayloadScoreQuery.java | 5 +
.../queries/payloads/SpanPayloadCheckQuery.java | 5 +
.../lucene/replicator/nrt/PrimaryNode.java | 2 +-
.../lucene/replicator/nrt/ReplicaNode.java | 2 +-
.../idversion/VersionBlockTreeTermsReader.java | 2 +-
.../document/LatLonDocValuesBoxQuery.java | 6 +
.../document/LatLonDocValuesDistanceQuery.java | 6 +
.../document/LatLonPointDistanceQuery.java | 6 +
.../document/LatLonPointInPolygonQuery.java | 6 +
.../org/apache/lucene/search/CoveringQuery.java | 5 +
.../lucene/search/DocValuesNumbersQuery.java | 6 +
.../lucene/search/DocValuesTermsQuery.java | 5 +
.../lucene/search/TermAutomatonQuery.java | 7 +-
.../lucene/search/TestTermAutomatonQuery.java | 5 +
.../spatial/composite/CompositeVerifyQuery.java | 5 +
.../composite/IntersectsRPTVerifyQuery.java | 6 +
.../spatial/prefix/AbstractPrefixTreeQuery.java | 6 +
.../serialized/SerializedDVStrategy.java | 6 +
.../spatial/vector/PointVectorStrategy.java | 5 +
.../spatial3d/PointInGeo3DShapeQuery.java | 6 +
.../spatial3d/geom/GeoBaseDistanceShape.java | 20 +-
.../spatial3d/geom/GeoDegeneratePath.java | 6 +
.../lucene/spatial3d/geom/GeoDistance.java | 37 +-
.../lucene/spatial3d/geom/GeoExactCircle.java | 12 +-
.../lucene/spatial3d/geom/GeoStandardPath.java | 117 ++-
.../lucene/spatial3d/geom/GeoPathTest.java | 4 +-
.../suggest/document/CompletionWeight.java | 6 +
.../lucene/index/AssertingLeafReader.java | 44 +-
.../lucene/search/ShardSearchingTestBase.java | 30 +-
.../similarities/AssertingSimilarity.java | 8 +-
.../similarities/BaseSimilarityTestCase.java | 22 +-
.../search/spans/AssertingSpanWeight.java | 6 +
.../org/apache/lucene/util/LuceneTestCase.java | 16 +-
solr/CHANGES.txt | 25 +
.../handler/dataimport/TestJdbcDataSource.java | 6 +
.../org/apache/solr/ltr/LTRScoringQuery.java | 6 +
.../org/apache/solr/ltr/feature/Feature.java | 6 +
.../apache/solr/ltr/feature/ValueFeature.java | 3 -
.../apache/solr/ltr/model/LTRScoringModel.java | 4 -
.../java/org/apache/solr/api/V2HttpCall.java | 11 +-
.../cloud/OverseerCollectionMessageHandler.java | 28 +-
.../java/org/apache/solr/cloud/RestoreCmd.java | 24 +-
.../org/apache/solr/cloud/ZkController.java | 16 +-
.../apache/solr/cloud/ZkDistributedQueue.java | 2 +-
.../solr/cloud/autoscaling/AutoScaling.java | 2 +
.../cloud/autoscaling/ScheduledTriggers.java | 5 +
.../cloud/autoscaling/SearchRateTrigger.java | 36 +-
.../org/apache/solr/core/CoreContainer.java | 41 +-
.../apache/solr/core/backup/BackupManager.java | 2 +-
.../org/apache/solr/handler/CdcrReplicator.java | 28 +
.../apache/solr/handler/SolrConfigHandler.java | 15 +-
.../org/apache/solr/handler/StreamHandler.java | 15 +-
.../org/apache/solr/query/SolrRangeQuery.java | 5 +
.../java/org/apache/solr/schema/LatLonType.java | 5 +
.../apache/solr/schema/ManagedIndexSchema.java | 6 +-
.../src/java/org/apache/solr/search/Filter.java | 6 +
.../solr/search/GraphTermsQParserPlugin.java | 10 +
.../apache/solr/search/JoinQParserPlugin.java | 5 +
.../solr/search/SolrConstantScoreQuery.java | 6 +
.../org/apache/solr/search/join/GraphQuery.java | 8 +-
.../solr/search/stats/CollectionStats.java | 22 +-
.../org/apache/solr/search/stats/TermStats.java | 15 +-
.../org/apache/solr/servlet/HttpSolrCall.java | 54 +-
.../apache/solr/update/CdcrTransactionLog.java | 144 +++
.../solr/update/DeleteByQueryWrapper.java | 5 +
.../apache/solr/update/SolrCmdDistributor.java | 119 ++-
.../org/apache/solr/update/TransactionLog.java | 2 +-
.../processor/DistributedUpdateProcessor.java | 483 +++++-----
.../cdcr-cluster1/conf/managed-schema | 29 +
.../cdcr-cluster1/conf/solrconfig.xml | 80 ++
.../cdcr-cluster2/conf/managed-schema | 29 +
.../cdcr-cluster2/conf/solrconfig.xml | 80 ++
.../TestReversedWildcardFilterFactory.java | 1 +
.../TestEmbeddedSolrServerAdminHandler.java | 8 -
.../AbstractCloudBackupRestoreTestCase.java | 26 +-
.../test/org/apache/solr/cloud/AssignTest.java | 2 +
.../solr/cloud/BaseCdcrDistributedZkTest.java | 903 ------------------
.../apache/solr/cloud/CdcrBootstrapTest.java | 356 --------
.../cloud/CdcrReplicationDistributedZkTest.java | 672 --------------
.../solr/cloud/CdcrReplicationHandlerTest.java | 330 -------
.../solr/cloud/CdcrRequestHandlerTest.java | 153 ----
.../solr/cloud/CdcrVersionReplicationTest.java | 307 -------
.../cloud/CollectionsAPIDistributedZkTest.java | 2 +
.../solr/cloud/LegacyCloudClusterPropTest.java | 163 ++++
...verseerCollectionConfigSetProcessorTest.java | 2 +
.../org/apache/solr/cloud/OverseerTest.java | 1 +
.../solr/cloud/ReplicationFactorTest.java | 259 +++++-
.../org/apache/solr/cloud/ShardSplitTest.java | 8 -
.../solr/cloud/TestCloudSearcherWarming.java | 17 +-
.../org/apache/solr/cloud/TestPullReplica.java | 2 -
.../org/apache/solr/cloud/TestTlogReplica.java | 3 +-
.../AutoAddReplicasIntegrationTest.java | 12 +-
.../autoscaling/AutoScalingHandlerTest.java | 12 +-
.../autoscaling/TriggerIntegrationTest.java | 115 ++-
.../cloud/cdcr/BaseCdcrDistributedZkTest.java | 907 +++++++++++++++++++
.../solr/cloud/cdcr/CdcrBidirectionalTest.java | 234 +++++
.../solr/cloud/cdcr/CdcrBootstrapTest.java | 302 ++++++
.../cdcr/CdcrReplicationDistributedZkTest.java | 672 ++++++++++++++
.../cloud/cdcr/CdcrReplicationHandlerTest.java | 331 +++++++
.../solr/cloud/cdcr/CdcrRequestHandlerTest.java | 153 ++++
.../apache/solr/cloud/cdcr/CdcrTestsUtil.java | 111 +++
.../cloud/cdcr/CdcrVersionReplicationTest.java | 307 +++++++
.../cloud/overseer/TestClusterStateMutator.java | 7 +
.../solr/cloud/overseer/ZkStateReaderTest.java | 51 ++
.../solr/cloud/rule/ImplicitSnitchTest.java | 7 +
.../solr/core/BlobRepositoryMockingTest.java | 7 +
.../org/apache/solr/core/CoreSorterTest.java | 2 +
.../admin/AutoscalingHistoryHandlerTest.java | 3 -
.../solr/handler/admin/TestCoreAdminApis.java | 2 +
.../org/apache/solr/legacy/TestLegacyTerms.java | 6 +-
.../reporters/SolrGangliaReporterTest.java | 2 +
.../reporters/solr/SolrCloudReportersTest.java | 6 +-
.../apache/solr/schema/SchemaWatcherTest.java | 3 +
.../schema/TestManagedSchemaThreadSafety.java | 1 +
.../solr/search/function/TestFunctionQuery.java | 10 +-
.../security/TestPKIAuthenticationPlugin.java | 2 +
.../solr/servlet/SolrRequestParserTest.java | 1 +
.../uninverting/TestFieldCacheSortRandom.java | 5 +
...lassificationUpdateProcessorFactoryTest.java | 2 +
.../ClassificationUpdateProcessorTest.java | 1 +
.../SignatureUpdateProcessorFactoryTest.java | 7 +-
...ipExistingDocumentsProcessorFactoryTest.java | 7 +
solr/licenses/hppc-0.7.1.jar.sha1 | 1 -
solr/licenses/hppc-0.7.3.jar.sha1 | 1 +
solr/solr-ref-guide/build.xml | 159 +++-
.../src/analytics-expression-sources.adoc | 91 ++
.../src/analytics-mapping-functions.adoc | 360 ++++++++
.../src/analytics-reduction-functions.adoc | 120 +++
solr/solr-ref-guide/src/analytics.adoc | 819 +++++++++++++++++
.../src/aws-solrcloud-tutorial.adoc | 271 ++++++
.../src/deployment-and-operations.adoc | 4 +-
solr/solr-ref-guide/src/how-to-contribute.adoc | 4 +-
.../images/aws-solrcloud-tutorial/aws-key.png | Bin 0 -> 52456 bytes
.../aws-security-create.png | Bin 0 -> 59543 bytes
.../aws-security-edit.png | Bin 0 -> 58213 bytes
solr/solr-ref-guide/src/meta-docs/publish.adoc | 39 +-
solr/solr-ref-guide/src/searching.adoc | 3 +-
.../tools/CheckLinksAndAnchors.java | 78 +-
.../tools/CustomizedAsciidoctorAntTask.java | 34 +
.../solr-ref-guide/tools/asciidoctor-antlib.xml | 22 +
.../apache/solr/client/solrj/SolrRequest.java | 24 +-
.../cloud/autoscaling/AutoScalingConfig.java | 15 +
.../client/solrj/impl/BinaryRequestWriter.java | 8 +-
.../solr/client/solrj/impl/HttpSolrClient.java | 37 +-
.../solrj/io/eval/CovarianceEvaluator.java | 43 +-
.../client/solrj/io/eval/GrandSumEvaluator.java | 54 ++
.../solrj/io/eval/MarkovChainEvaluator.java | 100 ++
.../solrj/io/eval/MinMaxScaleEvaluator.java | 115 +++
.../solrj/io/eval/NormalizeEvaluator.java | 14 +-
.../solrj/io/eval/PrecisionEvaluator.java | 51 ++
.../client/solrj/io/eval/SampleEvaluator.java | 13 +-
.../solrj/io/eval/ScalarAddEvaluator.java | 74 ++
.../solrj/io/eval/ScalarDivideEvaluator.java | 39 +
.../solrj/io/eval/ScalarMultiplyEvaluator.java | 39 +
.../solrj/io/eval/ScalarSubtractEvaluator.java | 39 +
.../solrj/io/eval/SumColumnsEvaluator.java | 71 ++
.../client/solrj/io/eval/SumRowsEvaluator.java | 63 ++
.../eval/TriangularDistributionEvaluator.java | 46 +
.../solrj/request/CollectionAdminRequest.java | 7 -
.../solrj/request/ConfigSetAdminRequest.java | 9 +-
.../client/solrj/request/CoreAdminRequest.java | 6 -
.../solrj/request/DelegationTokenRequest.java | 14 +-
.../client/solrj/request/DirectXmlRequest.java | 13 +-
.../solrj/request/DocumentAnalysisRequest.java | 43 +-
.../solrj/request/FieldAnalysisRequest.java | 16 +-
.../solrj/request/GenericSolrRequest.java | 6 -
.../solrj/request/HealthCheckRequest.java | 9 -
.../solr/client/solrj/request/LukeRequest.java | 12 +-
.../solr/client/solrj/request/QueryRequest.java | 8 -
.../client/solrj/request/RequestWriter.java | 94 +-
.../solr/client/solrj/request/SolrPing.java | 8 -
.../solr/client/solrj/request/V2Request.java | 49 +-
.../apache/solr/common/cloud/ZkStateReader.java | 12 +-
.../apache/solr/common/params/CommonParams.java | 3 +
.../solr/common/util/CommandOperation.java | 1 +
.../solr/common/util/ContentStreamBase.java | 10 +
.../solrj/impl/CloudSolrClientCacheTest.java | 7 +
.../solrj/io/stream/StreamExpressionTest.java | 378 ++++++--
.../solrj/request/TestV1toV2ApiMapper.java | 6 +-
.../java/org/apache/solr/SolrTestCaseJ4.java | 16 +
301 files changed, 9798 insertions(+), 4329 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/687d4c80/solr/core/src/java/org/apache/solr/cloud/ZkController.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/687d4c80/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AutoScalingConfig.java
----------------------------------------------------------------------