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/04/16 17:21:25 UTC

[45/46] lucene-solr:jira/solr-11833: Merge branch 'master' into jira/solr-11833

Merge branch 'master' into jira/solr-11833


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

Branch: refs/heads/jira/solr-11833
Commit: 5bbe689d6c75d74757932e74664f319a52695a1f
Parents: 76461f3 1e759bc
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Mon Apr 16 13:25:41 2018 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Mon Apr 16 13:25:41 2018 +0200

----------------------------------------------------------------------
 dev-tools/idea/.idea/modules.xml                |   1 +
 dev-tools/idea/lucene/analysis/nori/nori.iml    |  22 +
 .../maven/lucene/analysis/nori/pom.xml.template |  75 ++
 .../maven/lucene/analysis/pom.xml.template      |   1 +
 lucene/CHANGES.txt                              |  11 +
 lucene/NOTICE.txt                               |  12 +
 lucene/analysis/README.txt                      |   5 +
 lucene/analysis/build.xml                       |   7 +-
 lucene/analysis/nori/build.xml                  | 135 +++
 lucene/analysis/nori/ivy.xml                    |  33 +
 .../lucene/analysis/ko/DecompoundToken.java     |  69 ++
 .../lucene/analysis/ko/DictionaryToken.java     | 100 ++
 .../lucene/analysis/ko/GraphvizFormatter.java   | 180 ++++
 .../lucene/analysis/ko/KoreanAnalyzer.java      |  78 ++
 .../ko/KoreanPartOfSpeechStopFilter.java        |  85 ++
 .../ko/KoreanPartOfSpeechStopFilterFactory.java |  51 +
 .../analysis/ko/KoreanReadingFormFilter.java    |  51 +
 .../ko/KoreanReadingFormFilterFactory.java      |  42 +
 .../lucene/analysis/ko/KoreanTokenizer.java     | 957 +++++++++++++++++++
 .../analysis/ko/KoreanTokenizerFactory.java     |  89 ++
 .../java/org/apache/lucene/analysis/ko/POS.java | 304 ++++++
 .../org/apache/lucene/analysis/ko/Token.java    | 125 +++
 .../analysis/ko/dict/BinaryDictionary.java      | 239 +++++
 .../analysis/ko/dict/CharacterDefinition.java   | 136 +++
 .../analysis/ko/dict/ConnectionCosts.java       |  96 ++
 .../lucene/analysis/ko/dict/Dictionary.java     |  83 ++
 .../analysis/ko/dict/TokenInfoDictionary.java   |  77 ++
 .../lucene/analysis/ko/dict/TokenInfoFST.java   |  85 ++
 .../analysis/ko/dict/UnknownDictionary.java     |  61 ++
 .../lucene/analysis/ko/dict/UserDictionary.java | 235 +++++
 .../lucene/analysis/ko/dict/package-info.java   |  21 +
 .../apache/lucene/analysis/ko/package-info.java |  21 +
 .../tokenattributes/PartOfSpeechAttribute.java  |  54 ++
 .../PartOfSpeechAttributeImpl.java              |  92 ++
 .../ko/tokenattributes/ReadingAttribute.java    |  38 +
 .../tokenattributes/ReadingAttributeImpl.java   |  55 ++
 .../ko/tokenattributes/package-info.java        |  21 +
 .../apache/lucene/analysis/ko/util/CSVUtil.java |  95 ++
 .../lucene/analysis/ko/util/package-info.java   |  21 +
 lucene/analysis/nori/src/java/overview.html     |  34 +
 ...ache.lucene.analysis.util.TokenFilterFactory |  16 +
 ...apache.lucene.analysis.util.TokenizerFactory |  16 +
 .../analysis/ko/dict/CharacterDefinition.dat    | Bin 0 -> 65564 bytes
 .../lucene/analysis/ko/dict/ConnectionCosts.dat | Bin 0 -> 11178837 bytes
 .../ko/dict/TokenInfoDictionary$buffer.dat      | Bin 0 -> 7245625 bytes
 .../ko/dict/TokenInfoDictionary$fst.dat         | Bin 0 -> 5640925 bytes
 .../ko/dict/TokenInfoDictionary$posDict.dat     | Bin 0 -> 2712 bytes
 .../ko/dict/TokenInfoDictionary$targetMap.dat   | Bin 0 -> 811783 bytes
 .../ko/dict/UnknownDictionary$buffer.dat        | Bin 0 -> 101 bytes
 .../ko/dict/UnknownDictionary$posDict.dat       | Bin 0 -> 1823 bytes
 .../ko/dict/UnknownDictionary$targetMap.dat     | Bin 0 -> 36 bytes
 .../analysis/ko/StringMockResourceLoader.java   |  58 ++
 .../lucene/analysis/ko/TestKoreanAnalyzer.java  | 109 +++
 ...TestKoreanPartOfSpeechStopFilterFactory.java |  59 ++
 .../ko/TestKoreanReadingFormFilter.java         |  75 ++
 .../ko/TestKoreanReadingFormFilterFactory.java  |  51 +
 .../lucene/analysis/ko/TestKoreanTokenizer.java | 355 +++++++
 .../analysis/ko/TestKoreanTokenizerFactory.java | 113 +++
 .../ko/dict/TestTokenInfoDictionary.java        | 113 +++
 .../analysis/ko/dict/UserDictionaryTest.java    |  62 ++
 .../org/apache/lucene/analysis/ko/userdict.txt  |   5 +
 .../ko/util/BinaryDictionaryWriter.java         | 282 ++++++
 .../ko/util/CharacterDefinitionWriter.java      |  94 ++
 .../ko/util/ConnectionCostsBuilder.java         |  67 ++
 .../analysis/ko/util/ConnectionCostsWriter.java |  75 ++
 .../analysis/ko/util/DictionaryBuilder.java     |  67 ++
 .../ko/util/TokenInfoDictionaryBuilder.java     | 150 +++
 .../ko/util/TokenInfoDictionaryWriter.java      |  49 +
 .../ko/util/UnknownDictionaryBuilder.java       | 134 +++
 .../ko/util/UnknownDictionaryWriter.java        |  65 ++
 .../analysis/ko/dict/UnknownDictionaryTest.java |  74 ++
 .../apache/lucene/index/FilterMergePolicy.java  | 106 ++
 .../org/apache/lucene/index/MergePolicy.java    |   2 +-
 .../apache/lucene/index/MergePolicyWrapper.java | 100 --
 .../org/apache/lucene/index/NoMergePolicy.java  |  11 +-
 .../index/OneMergeWrappingMergePolicy.java      |   2 +-
 .../org/apache/lucene/index/PendingDeletes.java |  12 +-
 .../apache/lucene/index/PendingSoftDeletes.java |  11 +-
 .../apache/lucene/index/ReadersAndUpdates.java  |   3 +-
 .../lucene/index/UpgradeIndexMergePolicy.java   |   2 +-
 .../search/DisjunctionMatchesIterator.java      |   6 +-
 .../org/apache/lucene/search/LRUQueryCache.java |  22 +-
 .../java/org/apache/lucene/search/Matches.java  |  17 +-
 .../apache/lucene/search/MatchesIterator.java   |   2 +
 .../java/org/apache/lucene/search/Weight.java   |   1 +
 .../index/TestDemoParallelLeafReader.java       |   2 +-
 .../lucene/index/TestFilterMergePolicy.java     |  36 +
 .../apache/lucene/index/TestIndexSorting.java   |   1 +
 .../apache/lucene/index/TestIndexWriter.java    |   2 +-
 .../lucene/index/TestIndexWriterOnDiskFull.java |   2 +-
 .../lucene/index/TestMergePolicyWrapper.java    |  37 -
 .../apache/lucene/index/TestMultiFields.java    |   2 +-
 .../apache/lucene/index/TestPendingDeletes.java |   8 +-
 .../lucene/index/TestPendingSoftDeletes.java    |  23 +-
 .../apache/lucene/search/TestLRUQueryCache.java |  72 +-
 lucene/ivy-versions.properties                  |   1 +
 lucene/module-build.xml                         |  22 +
 .../spatial3d/geom/GeoComplexPolygon.java       | 381 ++++----
 .../org/apache/lucene/spatial3d/geom/Plane.java |   5 +-
 .../lucene/spatial3d/geom/SidedPlane.java       |  24 +
 .../apache/lucene/spatial3d/geom/Geo3DUtil.java |   7 +
 .../lucene/spatial3d/geom/GeoPolygonTest.java   |  20 +-
 .../spatial3d/geom/RandomGeoPolygonTest.java    |   1 -
 .../search/spell/LuceneLevenshteinDistance.java |   8 +
 .../apache/lucene/index/ForceMergePolicy.java   |   2 +-
 solr/CHANGES.txt                                |  27 +-
 .../handler/dataimport/DataImportHandler.java   |  37 +-
 .../org/apache/solr/cloud/ElectionContext.java  |   3 +-
 .../org/apache/solr/cloud/RecoveryStrategy.java |   2 +-
 .../solr/cloud/api/collections/RestoreCmd.java  |  26 +-
 .../solr/handler/CdcrReplicatorManager.java     |  29 +
 .../component/HttpShardHandlerFactory.java      | 165 +++-
 .../apache/solr/index/SortingMergePolicy.java   |   4 +-
 .../solr/response/GraphMLResponseWriter.java    |  14 +-
 .../solr/response/TextResponseWriter.java       |  27 +-
 .../solr/schema/LatLonPointSpatialField.java    |  15 +-
 .../spelling/ConjunctionSolrSpellChecker.java   |   3 +-
 .../DocBasedVersionConstraintsProcessor.java    | 512 ++++++++++
 ...BasedVersionConstraintsProcessorFactory.java | 441 ++-------
 .../solrconfig-externalversionconstraint.xml    |  32 +-
 .../org/apache/solr/TestDistributedSearch.java  |   1 +
 .../org/apache/solr/cloud/AddReplicaTest.java   |   1 +
 .../apache/solr/cloud/AliasIntegrationTest.java |   1 +
 .../cloud/ChaosMonkeyNothingIsSafeTest.java     |   1 +
 .../solr/cloud/CreateRoutedAliasTest.java       |   4 +
 .../apache/solr/cloud/DeleteReplicaTest.java    |   1 +
 .../solr/cloud/LeaderVoteWaitTimeoutTest.java   |  22 +-
 .../apache/solr/cloud/TestCloudRecovery.java    |   1 +
 .../TestLeaderInitiatedRecoveryThread.java      |   3 +
 .../solr/cloud/TestStressInPlaceUpdates.java    |   1 +
 .../AbstractCloudBackupRestoreTestCase.java     |  42 +-
 .../CollectionsAPIDistributedZkTest.java        |   1 -
 .../TestCollectionsAPIViaSolrCloudCluster.java  |   1 +
 .../autoscaling/ComputePlanActionTest.java      |   1 +
 .../cloud/autoscaling/IndexSizeTriggerTest.java |  24 +-
 .../cloud/autoscaling/ScheduledTriggerTest.java |   1 +
 .../sim/SimClusterStateProvider.java            |   9 +-
 .../autoscaling/sim/TestTriggerIntegration.java |   1 +
 .../solr/cloud/cdcr/CdcrBidirectionalTest.java  |  24 +-
 .../solr/cloud/cdcr/CdcrBootstrapTest.java      |   5 +-
 .../apache/solr/cloud/cdcr/CdcrTestsUtil.java   |  38 +
 .../admin/AutoscalingHistoryHandlerTest.java    |   3 +-
 .../component/TestHttpShardHandlerFactory.java  | 119 +++
 .../apache/solr/search/TestSolr4Spatial2.java   |  31 +-
 .../ConjunctionSolrSpellCheckerTest.java        |  35 +-
 .../update/TestDocBasedVersionConstraints.java  |  94 +-
 .../src/distributed-requests.adoc               |  40 +
 .../shards-and-indexing-data-in-solrcloud.adoc  |   4 +
 .../src/updating-parts-of-documents.adoc        |  10 +-
 .../org/apache/solr/client/solrj/io/Lang.java   |   1 +
 .../client/solrj/io/eval/ValueAtEvaluator.java  |  74 ++
 .../apache/solr/common/params/CommonParams.java |   1 +
 .../common/params/ModifiableSolrParams.java     |  20 +-
 .../solr/common/params/MultiMapSolrParams.java  |  11 +-
 .../apache/solr/common/params/ShardParams.java  |  12 +
 .../apache/solr/common/params/SolrParams.java   | 102 +-
 .../client/solrj/impl/CloudSolrClientTest.java  | 143 ++-
 .../apache/solr/client/solrj/io/TestLang.java   |   4 +-
 .../solrj/io/stream/MathExpressionTest.java     |  25 +
 .../cloud/TestCollectionStateWatchers.java      |   1 +
 .../solr/common/params/SolrParamTest.java       |  80 +-
 .../org/apache/solr/util/RandomMergePolicy.java |   4 +-
 162 files changed, 8249 insertions(+), 1024 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5bbe689d/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestTriggerIntegration.java
----------------------------------------------------------------------