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 2018/09/26 11:50:15 UTC
[44/45] lucene-solr:jira/solr-12709: Merge branch 'master' into
jira/solr-12709
Merge branch 'master' into jira/solr-12709
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7c847c36
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7c847c36
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7c847c36
Branch: refs/heads/jira/solr-12709
Commit: 7c847c3668cb8ed8f26b22bd3c5a2d54c5156ad0
Parents: 93f6726 667b829
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Wed Sep 26 10:30:04 2018 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Wed Sep 26 10:30:04 2018 +0200
----------------------------------------------------------------------
dev-tools/doap/lucene.rdf | 7 +
dev-tools/doap/solr.rdf | 7 +
lucene/CHANGES.txt | 37 +-
lucene/MIGRATE.txt | 17 +
.../analysis/core/LowerCaseTokenizer.java | 72 ---
.../core/LowerCaseTokenizerFactory.java | 75 ---
.../lucene/analysis/core/SimpleAnalyzer.java | 4 +-
.../lucene/analysis/core/StopAnalyzer.java | 6 +-
.../miscellaneous/LimitTokenCountAnalyzer.java | 2 +-
.../query/QueryAutoStopWordAnalyzer.java | 2 +-
.../shingle/ShingleAnalyzerWrapper.java | 2 +-
.../analysis/standard/ClassicAnalyzer.java | 11 +-
.../standard/UAX29URLEmailAnalyzer.java | 13 +-
.../lucene/analysis/util/CharTokenizer.java | 86 +--
...apache.lucene.analysis.util.TokenizerFactory | 1 -
.../analysis/br/TestBrazilianAnalyzer.java | 7 +-
.../lucene/analysis/core/TestAnalyzers.java | 8 -
.../analysis/custom/TestCustomAnalyzer.java | 13 +-
.../lucene/analysis/de/TestGermanAnalyzer.java | 8 +-
.../TestPerFieldAnalyzerWrapper.java | 2 +-
.../standard/TestStandardFactories.java | 16 -
.../analysis/util/TestCharTokenizers.java | 122 +---
.../index/TestBackwardsCompatibility.java | 7 +-
.../org/apache/lucene/index/index.7.5.0-cfs.zip | Bin 0 -> 15615 bytes
.../apache/lucene/index/index.7.5.0-nocfs.zip | Bin 0 -> 15629 bytes
.../org/apache/lucene/index/sorted.7.5.0.zip | Bin 0 -> 82239 bytes
lucene/common-build.xml | 2 +-
.../org/apache/lucene/analysis/Analyzer.java | 42 +-
.../analysis/standard/StandardAnalyzer.java | 13 +-
.../org/apache/lucene/document/LatLonPoint.java | 24 +
.../LatLonPointDistanceFeatureQuery.java | 480 ++++++++++++++
.../apache/lucene/index/FilterCodecReader.java | 4 +-
.../lucene/index/FilterDirectoryReader.java | 2 +-
.../apache/lucene/index/FilterLeafReader.java | 2 +-
.../org/apache/lucene/index/IndexWriter.java | 27 +-
.../org/apache/lucene/index/MergeState.java | 44 +-
.../org/apache/lucene/index/MultiFields.java | 27 +-
.../apache/lucene/search/TermInSetQuery.java | 2 +-
.../lucene/analysis/TestAnalyzerWrapper.java | 58 ++
.../TestLatLonPointDistanceFeatureQuery.java | 411 ++++++++++++
.../org/apache/lucene/index/TestAddIndexes.java | 2 +
.../apache/lucene/index/TestIndexSorting.java | 49 +-
.../java/org/apache/lucene/geo/Tessellator.java | 101 +--
.../document/BaseLatLonShapeTestCase.java | 2 +-
.../document/TestLatLonPolygonShapeQueries.java | 8 +-
.../apache/lucene/document/TestLatLonShape.java | 23 +
.../org/apache/lucene/geo/TestTessellator.java | 22 +
.../prefix/BytesRefIteratorTokenStream.java | 2 +-
.../spatial/prefix/PrefixTreeStrategy.java | 17 +
.../spatial3d/geom/GeoComplexPolygon.java | 115 +---
.../spatial3d/geom/GeoPolygonFactory.java | 15 +-
.../lucene/spatial3d/geom/GeoPolygonTest.java | 18 +
.../analyzing/AnalyzingInfixSuggester.java | 2 +-
.../suggest/analyzing/FreeTextSuggester.java | 2 +-
.../suggest/document/CompletionAnalyzer.java | 2 +-
.../analyzing/AnalyzingSuggesterTest.java | 365 ++++-------
.../suggest/analyzing/FuzzySuggesterTest.java | 159 ++---
.../analysis/CannedBinaryTokenStream.java | 2 +-
.../lucene/analysis/CannedTokenStream.java | 8 +-
solr/CHANGES.txt | 27 +-
solr/bin/solr.cmd | 4 +-
.../extraction/solr/collection1/conf/schema.xml | 15 -
.../ExtractingRequestHandlerTest.java | 13 +-
.../org/apache/solr/cloud/ZkShardTerms.java | 8 +-
.../cloud/api/collections/AddReplicaCmd.java | 334 ++++++----
.../solr/cloud/api/collections/Assign.java | 26 +-
.../cloud/api/collections/CreateShardCmd.java | 157 ++---
.../cloud/api/collections/MoveReplicaCmd.java | 15 +-
.../OverseerCollectionMessageHandler.java | 2 +-
.../cloud/api/collections/ReplaceNodeCmd.java | 2 +-
.../java/org/apache/solr/core/SolrConfig.java | 2 +-
.../solr/handler/admin/CollectionsHandler.java | 9 +-
.../reporters/jmx/JmxMetricsReporter.java | 10 +-
.../AbstractSpatialPrefixTreeFieldType.java | 35 +-
.../apache/solr/schema/PreAnalyzedField.java | 17 +-
.../solr/search/CollapsingQParserPlugin.java | 15 +-
.../collection1/conf/schema-copyfield-test.xml | 14 -
.../solr/collection1/conf/schema-folding.xml | 3 +-
.../solr/collection1/conf/schema-hash.xml | 13 -
.../collection1/conf/schema-required-fields.xml | 14 -
.../solr/collection1/conf/schema-rest.xml | 9 +-
.../solr/collection1/conf/schema-sql.xml | 13 -
.../collection1/conf/schema-tokenizer-test.xml | 11 +-
.../test-files/solr/collection1/conf/schema.xml | 15 +-
.../solr/collection1/conf/schema12.xml | 9 +-
.../solr/collection1/conf/schema15.xml | 14 -
.../solr/collection1/conf/schemasurround.xml | 14 -
.../org/apache/solr/cloud/AddReplicaTest.java | 92 ++-
.../apache/solr/cloud/MoveReplicaHDFSTest.java | 3 +-
.../org/apache/solr/cloud/MoveReplicaTest.java | 14 +-
.../apache/solr/cloud/MultiThreadedOCPTest.java | 2 +-
.../TestLeaderInitiatedRecoveryThread.java | 1 +
.../solr/cloud/TestSkipOverseerOperations.java | 3 +
.../TestSolrCloudWithDelegationTokens.java | 2 +-
.../apache/solr/cloud/TestWithCollection.java | 2 +
.../solr/cloud/UnloadDistributedZkTest.java | 1 +
.../org/apache/solr/cloud/ZkShardTermsTest.java | 14 +-
.../CollectionTooManyReplicasTest.java | 2 +-
.../CollectionsAPIAsyncDistributedZkTest.java | 1 +
.../cloud/api/collections/ShardSplitTest.java | 2 +-
.../ScheduledMaintenanceTriggerTest.java | 23 +-
.../cloud/autoscaling/ScheduledTriggerTest.java | 1 +
.../sim/SimClusterStateProvider.java | 93 ++-
.../autoscaling/sim/TestSimPolicyCloud.java | 2 +-
.../sim/TestSimTriggerIntegration.java | 5 +-
.../FieldAnalysisRequestHandlerTest.java | 2 +-
.../solr/handler/TestReplicationHandler.java | 2 +-
.../DistributedDebugComponentTest.java | 4 +-
.../schema/TestFieldCollectionResource.java | 10 +-
.../solr/rest/schema/TestFieldTypeResource.java | 3 +-
.../apache/solr/search/QueryEqualityTest.java | 2 +-
.../solr/search/TestCollapseQParserPlugin.java | 16 +
.../solr/util/TestMaxTokenLenTokenizer.java | 20 +-
solr/solr-ref-guide/src/collections-api.adoc | 68 +-
solr/solr-ref-guide/src/language-analysis.adoc | 13 +-
.../src/solrcloud-autoscaling-overview.adoc | 25 +-
...olrcloud-autoscaling-policy-preferences.adoc | 236 ++++---
.../cloud/autoscaling/FreeDiskVariable.java | 12 +-
.../solrj/cloud/autoscaling/PolicyHelper.java | 87 ++-
.../client/solrj/cloud/autoscaling/Row.java | 2 +-
.../solrj/cloud/autoscaling/Suggester.java | 2 +-
.../solrj/cloud/autoscaling/Suggestion.java | 5 +
.../solrj/request/CollectionAdminRequest.java | 58 ++
.../solr/common/ConditionalMapWriter.java | 2 +-
.../java/org/apache/solr/common/MapWriter.java | 10 +
.../java/org/apache/solr/common/util/Utils.java | 35 +-
.../testAutoScalingHandlerFailure.json | 141 ++++
.../testScheduledTriggerFailure.json | 52 ++
.../solrj/solr/autoscaling/testSortError.json | 225 +++++++
.../autoscaling/testSuggestionsRebalance2.json | 130 ++++
.../testSuggestionsRebalanceOnly.json | 105 +++
.../autoscaling/testSysPropSuggestions.json | 119 ++++
.../autoscaling/testUtilizeNodeFailure.json | 69 ++
.../autoscaling/testUtilizeNodeFailure2.json | 66 ++
.../solrj/solr/collection1/conf/schema-sql.xml | 13 -
.../solrj/solr/collection1/conf/schema.xml | 13 -
.../solr/configsets/streaming/conf/schema.xml | 11 -
.../solr/client/solrj/SolrExceptionTest.java | 3 +
.../solrj/beans/TestDocumentObjectBinder.java | 4 +
.../solrj/cloud/autoscaling/TestPolicy.java | 641 ++-----------------
.../solrj/cloud/autoscaling/TestPolicy2.java | 387 ++---------
.../solrj/impl/CloudSolrClientBuilderTest.java | 6 +
.../CloudSolrClientMultiConstructorTest.java | 3 +
.../ConcurrentUpdateSolrClientBuilderTest.java | 1 +
.../client/solrj/impl/HttpClientUtilTest.java | 6 +-
.../client/solrj/impl/LBHttpSolrClientTest.java | 2 +
.../solrj/io/stream/MathExpressionTest.java | 1 +
.../stream/StreamExpressionToExpessionTest.java | 2 +
.../StreamExpressionToExplanationTest.java | 2 +
.../request/TestCollectionAdminRequest.java | 5 +
.../solrj/request/TestUpdateRequestCodec.java | 5 +-
.../solrj/request/TestV1toV2ApiMapper.java | 11 +-
.../solrj/response/QueryResponseTest.java | 6 +-
.../response/TestDelegationTokenResponse.java | 2 +
.../solr/common/TestToleratedUpdateError.java | 5 +-
.../solr/common/params/ShardParamsTest.java | 5 +-
.../apache/solr/common/util/NamedListTest.java | 7 +-
.../solr/common/util/TestFastInputStream.java | 1 +
.../solr/common/util/TestNamedListCodec.java | 11 +-
159 files changed, 3661 insertions(+), 2673 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7c847c36/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7c847c36/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7c847c36/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimPolicyCloud.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7c847c36/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimTriggerIntegration.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7c847c36/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/PolicyHelper.java
----------------------------------------------------------------------